GitHub/XcodeGen
1
0
Fork 0
mirror of https://github.com/yonaskolb/XcodeGen.git synced 2026-03-18 20:02:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow multiple spec files to be provided to XcodeGen (#1270)

Browse Source 
* allow spec to be a comma separated list of specs instead of one

* update readme and --spec command documentation

* update Changelog

* print project name
This commit is contained in:
Roland
2022-11-02 07:42:22 +01:00
committed by GitHub
parent 87d7c7e136
commit 3e9fd048ef
4 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1
View File
@@ -6,6 +6,7 @@
- Added support for `enableGPUFrameCaptureMode` #1251 @bsudekum
- Config setting presets can now also be loaded from the main bundle when bundling XcodeGenKit #1135 @SofteqDG
- Added ability to generate multiple projects in one XcodeGen launch #1270 @skofgar
### Fixed
README.md
+1 -1
View File
@@ -130,7 +130,7 @@ This will look for a project spec in the current directory called `project.yml`
Options:
- **--spec**: An optional path to a `.yml` or `.json` project spec. Defaults to `project.yml`
- **--spec**: An optional path to a `.yml` or `.json` project spec. Defaults to `project.yml`. (It is also possible to link to multiple spec files by comma separating them. Note that all other flags will be the same.)
- **--project**: An optional path to a directory where the project will be generated. By default this is the directory the spec lives in.
- **--quiet**: Suppress informational and success messages.
- **--use-cache**: Used to prevent unnecessarily generating the project. If this is set, then a cache file will be written to when a project is generated. If `xcodegen` is later run but the spec and all the files it contains are the same, the project won't be generated.
Sources/XcodeGenCLI/Commands/GenerateCommand.swift
+1 -1
View File
@@ -64,7 +64,7 @@ class GenerateCommand: ProjectCommand {
do {
let existingCacheFile: String = try cacheFilePath.read()
if cacheFile.string == existingCacheFile {
info("Project has not changed since cache was written")
info("Project \(project.name) has not changed since cache was written")
return
}
} catch {
Sources/XcodeGenCLI/Commands/ProjectCommand.swift
+26 -18
View File
@@ -12,8 +12,8 @@ class ProjectCommand: Command {
let name: String
let shortDescription: String
@Key("-s", "--spec", description: "The path to the project spec file. Defaults to project.yml")
var spec: Path?
@Key("-s", "--spec", description: "The path to the project spec file. Defaults to project.yml. (It is also possible to link to multiple spec files by comma separating them. Note that all other flags will be the same.)")
var spec: String?
@Key("-r", "--project-root", description: "The path to the project root directory. Defaults to the directory containing the project spec.")
var projectRoot: Path?
@@ -29,24 +29,32 @@ class ProjectCommand: Command {
func execute() throws {
let projectSpecPath = (spec ?? "project.yml").absolute()
var projectSpecs: [Path] = []
if let spec = spec {
projectSpecs = spec.components(separatedBy: ",").map { Path($0).absolute() }
} else {
projectSpecs = [ Path("project.yml").absolute() ]
}
if !projectSpecPath.exists {
throw GenerationError.missingProjectSpec(projectSpecPath)
for projectSpecPath in projectSpecs {
if !projectSpecPath.exists {
throw GenerationError.missingProjectSpec(projectSpecPath)
}
let specLoader = SpecLoader(version: version)
let project: Project
let variables: [String: String] = disableEnvExpansion ? [:] : ProcessInfo.processInfo.environment
do {
project = try specLoader.loadProject(path: projectSpecPath, projectRoot: projectRoot, variables: variables)
} catch {
throw GenerationError.projectSpecParsingError(error)
}
try execute(specLoader: specLoader, projectSpecPath: projectSpecPath, project: project)
}
let specLoader = SpecLoader(version: version)
let project: Project
let variables: [String: String] = disableEnvExpansion ? [:] : ProcessInfo.processInfo.environment
do {
project = try specLoader.loadProject(path: projectSpecPath, projectRoot: projectRoot, variables: variables)
} catch {
throw GenerationError.projectSpecParsingError(error)
}
try execute(specLoader: specLoader, projectSpecPath: projectSpecPath, project: project)
}
func execute(specLoader: SpecLoader, projectSpecPath: Path, project: Project) throws {}