mirror of
https://github.com/nextcloud/desktop.git
synced 2024-11-29 20:28:57 +03:00
Improve build mode flag handling in mac crafter
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
This commit is contained in:
parent
5ad1a60b9e
commit
099648825e
1 changed files with 5 additions and 1 deletions
|
@ -73,6 +73,9 @@ struct MacCrafter: ParsableCommand {
|
||||||
@Option(name: [.long], help: "Git clone command; include options such as depth.")
|
@Option(name: [.long], help: "Git clone command; include options such as depth.")
|
||||||
var gitCloneCommand = "git clone --depth=1"
|
var gitCloneCommand = "git clone --depth=1"
|
||||||
|
|
||||||
|
@Option(name: [.long], help: "Run a full rebuild.")
|
||||||
|
var fullRebuild = false
|
||||||
|
|
||||||
mutating func run() throws {
|
mutating func run() throws {
|
||||||
print("Configuring build tooling.")
|
print("Configuring build tooling.")
|
||||||
|
|
||||||
|
@ -160,8 +163,9 @@ struct MacCrafter: ParsableCommand {
|
||||||
|
|
||||||
let allOptionsString = craftOptions.map({ "--options \"\($0)\"" }).joined(separator: " ")
|
let allOptionsString = craftOptions.map({ "--options \"\($0)\"" }).joined(separator: " ")
|
||||||
|
|
||||||
|
let buildMode = fullRebuild ? "-i" : buildAppBundle ? "--compile --install" : "--compile"
|
||||||
guard shell(
|
guard shell(
|
||||||
"\(craftCommand) --buildtype \(buildType) --compile --install \(allOptionsString) \(craftBlueprintName)"
|
"\(craftCommand) --buildtype \(buildType) \(buildMode) \(allOptionsString) \(craftBlueprintName)"
|
||||||
) == 0 else {
|
) == 0 else {
|
||||||
throw MacCrafterError.craftError("Error crafting Nextcloud Desktop Client.")
|
throw MacCrafterError.craftError("Error crafting Nextcloud Desktop Client.")
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue