build fixes

.gitea/workflows/build-macos.yml

@@ -112,6 +112,8 @@ jobs:
             -scheme TargetPrint \
             -destination "platform=macOS" \
             -only-testing:TargetPrintTests \
+            -jobs "$(sysctl -n hw.ncpu 2>/dev/null || echo 4)" \
+            -parallelizeTargets \
             CODE_SIGNING_ALLOWED=NO \
             ONLY_ACTIVE_ARCH=YES
 

Bridging-Header.h

@@ -4,3 +4,13 @@
 
 #import <cups/cups.h>
 #import <cups/ppd.h>
+
+// The Swift CUPS overlay marks cupsGetPPD unavailable ("use cupsCopyDestInfo").
+// SPEC §10 still requires the PPD file for AirPrint detection and vendor
+// colour-bypass keys, so we call the C symbol through this wrapper.
+static inline const char *TPCupsGetPPD(const char *name) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+    return cupsGetPPD(name);
+#pragma clang diagnostic pop
+}

Scripts/build_macos.sh

@@ -31,7 +31,10 @@ if xcodebuild_works; then
     SCHEME="TargetPrint"
     OUT_DIR="$ROOT/build/apps/$ARCH"
     DD_DIR="$ROOT/build/derived-$ARCH"
-    echo "==> Building TargetPrint ($CONFIGURATION, $ARCH) with $XCODEBUILD"
+    # shellcheck source=lib.sh
+    source "$SCRIPTS/lib.sh"
+    JOBS="$(cpu_jobs)"
+    echo "==> Building TargetPrint ($CONFIGURATION, $ARCH) with $XCODEBUILD (-jobs $JOBS)"
     rm -rf "$OUT_DIR"
     mkdir -p "$OUT_DIR" "$DD_DIR"
     "$XCODEBUILD" \
@@ -39,19 +42,20 @@ if xcodebuild_works; then
         -scheme "$SCHEME" \
         -configuration "$CONFIGURATION" \
         -arch "$ARCH" \
+        -jobs "$JOBS" \
+        -parallelizeTargets \
         -derivedDataPath "$DD_DIR" \
         CONFIGURATION_BUILD_DIR="$OUT_DIR" \
         ONLY_ACTIVE_ARCH=NO \
         CODE_SIGN_IDENTITY="${MACOS_CODESIGN_IDENTITY:--}" \
         CODE_SIGNING_ALLOWED=YES \
         ENABLE_HARDENED_RUNTIME=YES \
+        SWIFT_USE_PARALLEL_WHOLE_MODULE_OPTIMIZATION=YES \
         build
     APP="$OUT_DIR/TargetPrint.app"
     test -d "$APP"
     BIN="$APP/Contents/MacOS/TargetPrint"
     test -x "$BIN"
-    # shellcheck source=lib.sh
-    source "$SCRIPTS/lib.sh"
     sign_app "$APP" "$ROOT/TargetPrint.entitlements"
     echo "==> lipo -info"
     lipo -info "$BIN"

Scripts/build_universal.sh

@@ -1,13 +1,26 @@
 #!/bin/bash
 # SPEC §12 — build x86_64, arm64, and Universal 2 TargetPrint.app
+# x86_64 and arm64 compile concurrently; then lipo.
 set -euo pipefail
 
 CONFIGURATION="${1:-Release}"
 ROOT="$(cd "$(dirname "$0")/.." && pwd)"
 SCRIPTS="$(dirname "$0")"
 
-"$SCRIPTS/build_macos.sh" x86_64 "$CONFIGURATION"
+echo "==> Compiling x86_64 and arm64 in parallel"
-"$SCRIPTS/build_macos.sh" arm64 "$CONFIGURATION"
+"$SCRIPTS/build_macos.sh" x86_64 "$CONFIGURATION" &
+pid_x86=$!
+"$SCRIPTS/build_macos.sh" arm64 "$CONFIGURATION" &
+pid_arm=$!
+
+status=0
+wait "$pid_x86" || status=1
+wait "$pid_arm" || status=1
+if [ "$status" -ne 0 ]; then
+    echo "error: one or both architecture builds failed" >&2
+    exit 1
+fi
+
 "$SCRIPTS/make_universal.sh"
 
 echo "==> All architectures:"

Scripts/lib.sh

@@ -31,6 +31,14 @@ sign_app() {
     codesign --verify --verbose=2 "$app" || true
 }
 
+cpu_jobs() {
+    if [ -n "${JOBS:-}" ]; then
+        echo "$JOBS"
+        return
+    fi
+    sysctl -n hw.ncpu 2>/dev/null || nproc 2>/dev/null || echo 4
+}
+
 zip_app() {
     local app="$1"
     local dest="$2"

Scripts/swiftc_build.sh

@@ -20,10 +20,19 @@ BIN="$MACOS_DIR/TargetPrint"
 
 SDKROOT="${SDKROOT:-$(xcrun --sdk macosx --show-sdk-path)}"
 SWIFT="${SWIFT:-$(xcrun --find swiftc)}"
-TARGET="${ARCH}-apple-macos10.15"
+# Match the SDK so swiftc uses the prebuilt stdlib. Targeting macos10.15
+# with a modern CLT compiler forces a multi-minute stdlib rebuild and
+# still may not find a compatible x86_64 runtime.
+SDK_VER="$(xcrun --sdk macosx --show-sdk-version 2>/dev/null || sw_vers -productVersion)"
+SDK_VER="${SDK_VER%%$'\n'*}"
+TARGET="${ARCH}-apple-macos${SDK_VER}"
 MIN_OS="10.15"
 
-echo "==> swiftc build ($CONFIGURATION, $ARCH)"
+# shellcheck source=lib.sh
+source "$(dirname "$0")/lib.sh"
+JOBS="$(cpu_jobs)"
+
+echo "==> swiftc build ($CONFIGURATION, $ARCH, $JOBS threads)"
 echo "    SDKROOT=$SDKROOT"
 echo "    SWIFT=$SWIFT"
 echo "    TARGET=$TARGET"
@@ -40,7 +49,7 @@ if [ "${#SOURCES[@]}" -eq 0 ]; then
     exit 1
 fi
 
-OPT_FLAGS=(-O)
+OPT_FLAGS=(-O -whole-module-optimization)
 if [ "$CONFIGURATION" != "Release" ]; then
     OPT_FLAGS=(-Onone -g)
 fi
@@ -50,7 +59,8 @@ fi
     -target "$TARGET" \
     -swift-version 5 \
     "${OPT_FLAGS[@]}" \
-    -whole-module-optimization \
+    -num-threads "$JOBS" \
+    -j "$JOBS" \
     -module-name TargetPrint \
     -import-objc-header "$ROOT/Bridging-Header.h" \
     -Xcc "-I${SDKROOT}/usr/include" \
@@ -83,9 +93,10 @@ if [ -f "$ICON_SRC" ] && command -v sips >/dev/null 2>&1; then
     for pair in 16:icon_16x16 32:icon_32x32 128:icon_128x128 256:icon_256x256 512:icon_512x512; do
         size="${pair%%:*}"
         name="${pair##*:}"
-        sips -z "$size" "$size" "$ICON_SRC" --out "$ICONSET/AppIcon.iconset/${name}.png" >/dev/null
+        sips -z "$size" "$size" "$ICON_SRC" --out "$ICONSET/AppIcon.iconset/${name}.png" >/dev/null &
-        sips -z $((size * 2)) $((size * 2)) "$ICON_SRC" --out "$ICONSET/AppIcon.iconset/${name}@2x.png" >/dev/null
+        sips -z $((size * 2)) $((size * 2)) "$ICON_SRC" --out "$ICONSET/AppIcon.iconset/${name}@2x.png" >/dev/null &
     done
+    wait
     if command -v iconutil >/dev/null 2>&1 && iconutil -c icns "$ICONSET/AppIcon.iconset" -o "$RES_DIR/AppIcon.icns" 2>/dev/null; then
         echo "    AppIcon.icns"
     else
@@ -94,8 +105,6 @@ if [ -f "$ICON_SRC" ] && command -v sips >/dev/null 2>&1; then
     rm -rf "$ICONSET"
 fi
 
-# shellcheck source=lib.sh
-source "$(dirname "$0")/lib.sh"
 sign_app "$APP" "$ROOT/TargetPrint.entitlements"
 
 echo "==> lipo -info"

Sources/AppError.swift

@@ -19,7 +19,7 @@ enum AppError: Error, CustomStringConvertible {
         switch self {
         case .invalidJob: return .invalidJob
         case .unreadableTarget: return .unreadableTarget
-        case .printer: return .printer
+        case .printer: return .printerError
         case .internalFatal: return .internalFatal
         }
     }

Sources/Printing/CUPSManager.swift

@@ -77,9 +77,11 @@ enum CUPSManager {
     // MARK: - PPD
 
     static func ppdPath(forQueue name: String) -> String? {
-        guard let cPath = cupsGetPPD(name) else { return nil }
+        name.withCString { cName in
+            guard let cPath = TPCupsGetPPD(cName) else { return nil }
             return String(cString: cPath)
         }
+    }
 
     static func ppdContents(forQueue name: String) -> String? {
         guard let path = ppdPath(forQueue: name) else { return nil }

Sources/Printing/ColorMatching.swift

@@ -80,7 +80,7 @@ enum ColorMatching {
     }
 
     static func stripColorMatchingAccessories(from panel: NSPrintPanel) {
-        let accessories = panel.accessoryControllers()
+        let accessories = panel.accessoryControllers
         for ac in accessories {
             let title = (ac.title ?? "") + " " + (ac.nibName ?? "")
             let hay = title.lowercased()

Sources/Printing/PrintEngine.swift

@@ -73,7 +73,7 @@ final class PrintEngine {
         ColorMatching.apply(colorMode, to: info)
 
         do {
-            if let queue = try CUPSManager.namedQueue(printerName) ?? try CUPSManager.listQueues().first(where: { $0.name == printerName }) {
+            if let queue = try CUPSManager.namedQueue(printerName) {
                 let bypass = CUPSManager.vendorColorBypass(make: queue.make, model: queue.model, ppdText: queue.ppdText)
                 CUPSManager.applyVendorBypass(bypass, to: info)
             }