From a4624d3e1868a884fc7407c0ea90f26aa2e3c212 Mon Sep 17 00:00:00 2001 From: Sho Ikeda Date: Thu, 26 Dec 2019 15:27:23 +0900 Subject: [PATCH 1/3] Don't add framework dependency's directory to FRAMEWORK_SEARCH_PATHS if it is implicit Because we assume the dependency is in BUILT_PRODUCTS_DIR. Co-authored-by: yutailang0119 --- Sources/XcodeGenKit/PBXProjGenerator.swift | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Sources/XcodeGenKit/PBXProjGenerator.swift b/Sources/XcodeGenKit/PBXProjGenerator.swift index e42e8fb6..4feaafda 100644 --- a/Sources/XcodeGenKit/PBXProjGenerator.swift +++ b/Sources/XcodeGenKit/PBXProjGenerator.swift @@ -534,8 +534,10 @@ public class PBXProjGenerator { } case .framework: - let buildPath = Path(dependency.reference).parent().string.quoted - frameworkBuildPaths.insert(buildPath) + if !dependency.implicit { + let buildPath = Path(dependency.reference).parent().string.quoted + frameworkBuildPaths.insert(buildPath) + } let fileReference: PBXFileElement if dependency.implicit { From 3a76997c1a0010f1de48c00aa28249d4ece52a12 Mon Sep 17 00:00:00 2001 From: Sho Ikeda Date: Mon, 6 Jan 2020 23:12:58 +0900 Subject: [PATCH 2/3] Update CHANGELOG Co-authored-by: yutailang0119 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2516749f..ea9ee5e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ #### Fixed - Fixed resolving a relative path for `projectReference.path` [#740](https://github.com/yonaskolb/XcodeGen/pull/740) @kateinoigakukun +- Don't add framework dependency's directory to `FRAMEWORK_SEARCH_PATHS` if it is implicit [#744](https://github.com/yonaskolb/XcodeGen/pull/744) @ikesyo @yutailang0119 #### Internal - Update to SwiftCLI 6.0 and use the new property wrappers [#749](https://github.com/yonaskolb/XcodeGen/pull/749) @yonaskolb From 0c6dd1401a4187389f41347f480d0c99ac847866 Mon Sep 17 00:00:00 2001 From: Dan Loman Date: Tue, 17 Dec 2019 15:27:29 -0800 Subject: [PATCH 3/3] Add option to generate only plist files Add changelog entry Update CHANGELOG.md Co-Authored-By: Yonas Kolb Update to new flag PropertyWrapper --- CHANGELOG.md | 1 + Sources/XcodeGenCLI/Commands/GenerateCommand.swift | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2516749f..fdc5b7d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ #### Added - Support for language and region settings on a target basis [#728](https://github.com/yonaskolb/XcodeGen/pull/728) @FranzBusch +- Added option to generate only Info.plist files with `--only-plists` [#739](https://github.com/yonaskolb/XcodeGen/pull/739) @namolnad #### Fixed - Fixed resolving a relative path for `projectReference.path` [#740](https://github.com/yonaskolb/XcodeGen/pull/740) @kateinoigakukun diff --git a/Sources/XcodeGenCLI/Commands/GenerateCommand.swift b/Sources/XcodeGenCLI/Commands/GenerateCommand.swift index d2319f4e..8f5c1dfd 100644 --- a/Sources/XcodeGenCLI/Commands/GenerateCommand.swift +++ b/Sources/XcodeGenCLI/Commands/GenerateCommand.swift @@ -19,6 +19,9 @@ class GenerateCommand: ProjectCommand { @Key("-p", "--project", description: "The path to the directory where the project should be generated. Defaults to the directory the spec is in. The filename is defined in the project spec") var projectDirectory: Path? + @Flag("--only-plists", description: "Generate only plist files") + var onlyPlists: Bool + init(version: Version) { super.init(version: version, name: "generate", @@ -81,6 +84,9 @@ class GenerateCommand: ProjectCommand { let fileWriter = FileWriter(project: project) do { try fileWriter.writePlists() + if onlyPlists { + return + } } catch { throw GenerationError.writingError(error) }