mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-22 13:05:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6921 from nextcloud/bugfix/mac-crafter-cross-build

Browse source 
Add additional options to make cross-compiling client feasible with Mac Crafter
This commit is contained in:
Claudio Cambra 2024-07-19 16:57:31 +08:00 committed by GitHub
commit 0056a24460
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
admin/osx/mac-crafter/Sources/main.swift
View file

@ -33,9 +33,15 @@ struct MacCrafter: ParsableCommand {
@Option(name: [.short, .long], help: "Code signing identity for desktop client and libs.")
var codeSignIdentity: String?
@Option(name: [.short, .customLong("buildPath")], help: "Path for build files to be written.")
@Option(name: [.short, .long], help: "Path for build files to be written.")
var buildPath = "\(FileManager.default.currentDirectoryPath)/build"
@Option(name: [.short, .long], help: "Path for the final product to be put.")
var productPath = "\(FileManager.default.currentDirectoryPath)/product"
@Option(name: [.short, .long], help: "Architecture.")
var arch = "arm64"
@Option(name: [.long], help: "Brew installation script URL.")
var brewInstallShUrl = "https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh"
@ -106,7 +112,7 @@ struct MacCrafter: ParsableCommand {
let craftMasterDir = "\(buildPath)/craftmaster"
let craftMasterIni = "\(repoRootDir)/craftmaster.ini"
let craftMasterPy = "\(craftMasterDir)/CraftMaster.py"
let craftTarget = "macos-clang-arm64"
let craftTarget = arch == "arm64" ? "macos-clang-arm64" : "macos-64-clang"
let craftCommand =
"python3 \(craftMasterPy) --config \(craftMasterIni) --target \(craftTarget) -c"
@ -140,6 +146,7 @@ struct MacCrafter: ParsableCommand {
var craftOptions = [
"\(craftBlueprintName).srcDir=\(repoRootDir)",
"\(craftBlueprintName).osxArchs=\(arch)",
"\(craftBlueprintName).buildTests=\(buildTests ? "True" : "False")",
"\(craftBlueprintName).buildMacOSBundle=\(disableAppBundle ? "False" : "True")",
"\(craftBlueprintName).buildFileProviderModule=\(buildFileProviderModule ? "True" : "False")"
@ -193,11 +200,13 @@ struct MacCrafter: ParsableCommand {
}
print("Code-signing Nextcloud Desktop Client libraries and frameworks...")
let clientAppDir = "\(clientBuildDir)/image-\(buildType)-master/\(appName).app"
try codesignClientAppBundle(at: clientAppDir, withCodeSignIdentity: codeSignIdentity)
print("Placing Nextcloud Desktop Client in product directory...")
try fm.createDirectory(atPath: productPath, withIntermediateDirectories: true, attributes: nil)
try fm.copyItem(atPath: clientAppDir, toPath: productPath)
print("Done!")
}
}