mirror of
https://github.com/yonaskolb/XcodeGen.git
synced 2024-12-11 07:16:40 +03:00
Merge branch 'master' into use_relative_path_for_XcodeProj
This commit is contained in:
commit
74203dc62d
@ -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
|
||||
|
@ -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)
|
||||
}
|
||||
|
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user