Merge branch 'master' into use_relative_path_for_XcodeProj

yonaskolb · Jan 12, 2020 · 74203dc · 74203dc
2 parents b7a0d56 + 308b351
commit 74203dc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,9 +4,11 @@
 
 #### 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
+- 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
 - Fixed resolving relative path passed to `XcodeProj` [#751](https://github.com/yonaskolb/XcodeGen/pull/751) @PycKamil
 
 #### Internal

diff --git 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)
         }

diff --git 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 {