From: Claudio Cambra Date: Thu, 20 Jun 2024 07:59:25 +0000 (+0800) Subject: Remove previous craft client builder X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~6^2~148 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6c82430553a039ea32b4d515b3459d7f4669dff5;p=nextcloud-desktop.git Remove previous craft client builder Signed-off-by: Claudio Cambra --- diff --git a/admin/osx/craft-client.swift b/admin/osx/craft-client.swift deleted file mode 100644 index cf8b12f7e..000000000 --- a/admin/osx/craft-client.swift +++ /dev/null @@ -1,120 +0,0 @@ -import Foundation - -@discardableResult -func run( - _ launchPath: String, - _ args: [String], - env: [String: String]? = nil, - quiet: Bool = false -) -> Int32 { - let task = Process() - task.launchPath = launchPath - task.arguments = args - - if let env, - let combinedEnv = task.environment?.merging(env, uniquingKeysWith: { (_, new) in new }) - { - task.environment = combinedEnv - } - - if quiet { - task.standardOutput = nil - task.standardError = nil - } - - task.launch() - task.waitUntilExit() - return task.terminationStatus -} - -func run( - _ launchPath: String, - _ args: String..., - env: [String: String]? = nil, - quiet: Bool = false -) -> Int32 { - return run(launchPath, args, env: env, quiet: quiet) -} - -@discardableResult -func shell(_ commands: String..., env: [String: String]? = nil, quiet: Bool = false) -> Int32 { - return run("/bin/zsh", ["-c"] + commands, env: env, quiet: quiet) -} - -func commandExists(_ command: String) -> Bool { - return run("/usr/bin/type", command, quiet: true) == 0 -} - -func installIfMissing( - _ command: String, - _ installCommand: String, - installCommandEnv: [String: String]? = nil -) { - if commandExists(command) { - print("\(command) is installed.") - } else { - print("\(command) is missing. Installing...") - guard shell(installCommand, env: installCommandEnv) == 0 else { - print("Failed to install \(command).") - exit(1) - } - print("\(command) installed.") - } -} - -func codesign( - identity: String, - path: String, - options: String = "--timestamp --force --preserve-metadata=entitlements --verbose=4 --options runtime" -) { - print("Code-signing \(path)...") - let command = "codesign -s \"\(identity)\" \(options) \(path)" - guard shell(command) == 0 else { - print("Failed to code-sign \(path).") - exit(1) - } -} - -print("Configuring build tooling.") - -installIfMissing("git", "xcode-select --install") -installIfMissing( - "brew", - "curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh | /bin/bash", - installCommandEnv: ["NONINTERACTIVE": "1"] -) -installIfMissing("inkscape", "brew install inkscape") -installIfMissing("python3", "brew install pyenv && pyenv install 3.12.4") - -print("Build tooling configured.") -print("Configuring KDE Craft.") - -let fm = FileManager.default -let currentDir = fm.currentDirectoryPath -let craftDir = "\(currentDir)/craftmaster" - -if fm.fileExists(atPath: craftDir) { - print("KDE Craft is already cloned.") -} else { - print("Cloning KDE Craft...") - shell("git clone -q --depth=1 https://invent.kde.org/packaging/craftmaster.git \(craftDir)") -} - -print("Configuring Nextcloud Desktop Client blueprints for KDE Craft...") - -let repoRootDir = "\(currentDir)/../.." -let craftMasterIni = "\(repoRootDir)/craftmaster.ini" -let craftMasterPy = "\(craftDir)/CraftMaster.py" -let craftTarget = "macos-clang-arm64" -let craftCommand = "python3 \(craftMasterPy) --config \(craftMasterIni) --target \(craftTarget) -c" -let clientBlueprintsGitUrl = "https://github.com/nextcloud/desktop-client-blueprints.git" -shell("\(craftCommand) --add-blueprint-repository \(clientBlueprintsGitUrl)") - -print("Crafting KDE Craft...") -shell("\(craftCommand) craft") - -print("Crafting Nextcloud Desktop Client dependencies...") -shell("\(craftCommand) --install-deps nextcloud-client") - -print("Crafting Nextcloud Desktop Client...") -shell("\(craftCommand) --src-dir \(repoRootDir) nextcloud-client")