Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bypass codesign when building Xcode projects #651

Merged
merged 1 commit into from
Oct 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@

##### Bug Fixes

* None.
* Always bypass codesigning when building Xcode projects.
[John Fairhurst](https://github.com/johnfairh)
[#1183](https://github.com/realm/jazzy/issues/1183)

## 0.30.1

Expand Down
2 changes: 1 addition & 1 deletion Source/SourceKittenFramework/ClangTranslationUnit.swift
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public struct ClangTranslationUnit {
- parameter path: Path to run `xcodebuild` from. Uses current path by default.
*/
public init?(headerFiles: [String], xcodeBuildArguments: [String], inPath path: String = FileManager.default.currentDirectoryPath) {
let xcodeBuildOutput = XcodeBuild.cleanBuild(arguments: xcodeBuildArguments + ["-dry-run"], inPath: path) ?? ""
let xcodeBuildOutput = XcodeBuild.cleanBuild(arguments: xcodeBuildArguments + ["-dry-run"], inPath: path).string ?? ""
guard let clangArguments = parseCompilerArguments(xcodebuildOutput: xcodeBuildOutput, language: .objc, moduleName: nil) else {
fputs("could not parse compiler arguments\n\(xcodeBuildOutput)\n", stderr)
return nil
Expand Down
5 changes: 2 additions & 3 deletions Source/SourceKittenFramework/Module.swift
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,7 @@ public struct Module {
?? moduleName(fromArguments: xcodeBuildArguments)

// Executing normal build
fputs("Running xcodebuild\n", stderr)
let results = XcodeBuild.launch(arguments: xcodeBuildArguments, inPath: path)
let results = XcodeBuild.build(arguments: xcodeBuildArguments, inPath: path)
if results.terminationStatus != 0 {
fputs("Could not successfully run `xcodebuild`.\n", stderr)
fputs("Please check the build arguments.\n", stderr)
Expand All @@ -153,7 +152,7 @@ public struct Module {
return
}
// Executing `clean build` is a fallback.
let xcodeBuildOutput = XcodeBuild.cleanBuild(arguments: xcodeBuildArguments, inPath: path) ?? ""
let xcodeBuildOutput = XcodeBuild.cleanBuild(arguments: xcodeBuildArguments, inPath: path).string ?? ""
guard let arguments = parseCompilerArguments(xcodebuildOutput: xcodeBuildOutput, language: .swift, moduleName: name) else {
fputs("Could not parse compiler arguments from `xcodebuild` output.\n", stderr)
fputs("Please confirm that `xcodebuild` is building a Swift module.\n", stderr)
Expand Down
29 changes: 14 additions & 15 deletions Source/SourceKittenFramework/Xcode.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,33 +11,32 @@ import Yams

internal enum XcodeBuild {
/**
Run `xcodebuild clean build` along with any passed in build arguments.
Run `xcodebuild clean build` bypassing signing, along with any passed in build arguments.

- parameter arguments: Arguments to pass to `xcodebuild`.
- parameter path: Path to run `xcodebuild` from.

- returns: `xcodebuild`'s STDERR+STDOUT output combined.
- returns: results including `xcodebuild`'s STDERR+STDOUT output combined.
*/
internal static func cleanBuild(arguments: [String], inPath path: String) -> String? {
let arguments = arguments + ["clean",
"build",
"CODE_SIGN_IDENTITY=",
"CODE_SIGNING_REQUIRED=NO",
"CODE_SIGNING_ALLOWED=NO"]
fputs("Running xcodebuild\n", stderr)
return run(arguments: arguments, inPath: path)
internal static func cleanBuild(arguments: [String], inPath path: String) -> Exec.Results {
let arguments = arguments + ["clean", "build"]
return build(arguments: arguments, inPath: path)
}

/**
Run `xcodebuild` along with any passed in build arguments.
Run `xcodebuild` bypassing signing, along with any passed in build arguments.

- parameter arguments: Arguments to pass to `xcodebuild`.
- parameter path: Path to run `xcodebuild` from.

- returns: `xcodebuild`'s STDERR+STDOUT output combined.
- returns: results including `xcodebuild`'s STDERR+STDOUT output combined.
*/
internal static func run(arguments: [String], inPath path: String) -> String? {
return launch(arguments: arguments, inPath: path, pipingStandardError: true).string
internal static func build(arguments: [String], inPath path: String) -> Exec.Results {
let arguments = arguments + ["CODE_SIGN_IDENTITY=",
"CODE_SIGNING_REQUIRED=NO",
"CODE_SIGNING_ALLOWED=NO"]
fputs("Running xcodebuild\n", stderr)
return launch(arguments: arguments, inPath: path, pipingStandardError: true)
}

/**
Expand All @@ -49,7 +48,7 @@ internal enum XcodeBuild {

- returns: `Exec.Result` containing `xcodebuild`'s exit status, STDOUT output and, optionally, both STDERR+STDOUT output combined.
*/
internal static func launch(arguments: [String], inPath path: String, pipingStandardError: Bool = true) -> Exec.Results {
private static func launch(arguments: [String], inPath path: String, pipingStandardError: Bool = true) -> Exec.Results {
return Exec.run("/usr/bin/xcodebuild",
arguments,
currentDirectory: path,
Expand Down