added building distribution style packages as an option

Author: scriptingosx

Sources/quickpkg/InputType.swift

@@ -23,3 +23,21 @@ enum Compression: String, ExpressibleByArgument, CaseIterable {
   case latest
   case legacy
 }
+
+enum PackageType: String, EnumerableFlag {
+  case component
+  case distribution
+
+  static func name(for value: PackageType) -> NameSpecification {
+    .long
+  }
+
+  static func help(for value: PackageType) -> ArgumentHelp? {
+    switch value {
+    case .component:
+      return "Build a component package"
+    case .distribution:
+      return "Build a distribution package using productbuild"
+    }
+  }
+}

Sources/quickpkg/PackageBuilder.swift

@@ -30,6 +30,7 @@ struct PackageBuilder: Sendable {
   func build(
     payloadDir: URL,
     outputPath: String,
+    name: String,
     identifier: String,
     version: String,
     installLocation: String,
@@ -38,6 +39,7 @@ struct PackageBuilder: Sendable {
     compression: Compression,
     relocatable: Bool,
     minOSVersion: String?,
+    packageType: PackageType,
     sign: String?,
     keychain: String?,
     cert: String?,
@@ -52,7 +54,7 @@ struct PackageBuilder: Sendable {
       installLocation: installLocation,
       outputPlist: componentPlist
     )
-    
+
     // Modify relocatable setting if needed
     if !relocatable {
       try PlistHandler.setRelocatable(false, in: componentPlist)
@@ -64,6 +66,14 @@ struct PackageBuilder: Sendable {
       "/usr/bin/xattr", "-dr", "com.apple.quarantine", payloadDir.path
     ])
 
+    // Determine output path for pkgbuild (temp location for distribution, final for component)
+    let pkgbuildOutput: String
+    if packageType == .distribution {
+      pkgbuildOutput = tempDir.appendingPathComponent("\(name).pkg").path
+    } else {
+      pkgbuildOutput = outputPath
+    }
+
     // Build the pkgbuild command
     var arguments = [
       "/usr/bin/pkgbuild",
@@ -73,12 +83,12 @@ struct PackageBuilder: Sendable {
       "--version", version,
       "--install-location", installLocation
     ]
-    
+
     if let scriptsDir = scripts {
       arguments += ["--scripts", scriptsDir.path]
       logger.log("Scripts path: \(scriptsDir.path)", level: 1)
     }
-    
+
     if let ownership = ownership {
       arguments += ["--ownership", ownership.rawValue]
     }
@@ -90,27 +100,84 @@ struct PackageBuilder: Sendable {
       logger.log("Minimum OS version: \(minOSVersion)", level: 1)
     }
 
+    // Only sign with pkgbuild for component packages
+    if packageType == .component {
+      if let sign = sign {
+        arguments += ["--sign", sign]
+      }
+
+      if let keychain = keychain {
+        arguments += ["--keychain", keychain]
+      }
+
+      if let cert = cert {
+        arguments += ["--cert", cert]
+      }
+    }
+
+    arguments.append(pkgbuildOutput)
+
+    logger.log("Building component package: \(pkgbuildOutput)", level: 1)
+    let result = try await executor.run(arguments)
+
+    logger.log(result.stdout, level: 1)
+
+    if result.exitCode != 0 {
+      throw QuickPkgError.pkgbuildFailed("(\(result.exitCode)) \(result.stderr)")
+    }
+
+    // For distribution packages, run productbuild
+    if packageType == .distribution {
+      try await buildDistribution(
+        componentPackage: pkgbuildOutput,
+        outputPath: outputPath,
+        identifier: identifier,
+        version: version,
+        sign: sign,
+        keychain: keychain,
+        cert: cert
+      )
+    }
+  }
+
+  /// Build a distribution package from a component package
+  private func buildDistribution(
+    componentPackage: String,
+    outputPath: String,
+    identifier: String,
+    version: String,
+    sign: String?,
+    keychain: String?,
+    cert: String?
+  ) async throws {
+    var arguments = [
+      "/usr/bin/productbuild",
+      "--package", componentPackage,
+      "--identifier", identifier,
+      "--version", version
+    ]
+
     if let sign = sign {
       arguments += ["--sign", sign]
     }
-    
+
     if let keychain = keychain {
       arguments += ["--keychain", keychain]
     }
-    
+
     if let cert = cert {
       arguments += ["--cert", cert]
     }
-    
+
     arguments.append(outputPath)
-    
-    logger.log("Building package: \(outputPath)", level: 1)
+
+    logger.log("Building distribution package: \(outputPath)", level: 1)
     let result = try await executor.run(arguments)
-    
+
     logger.log(result.stdout, level: 1)
-    
+
     if result.exitCode != 0 {
-      throw QuickPkgError.pkgbuildFailed("(\(result.exitCode)) \(result.stderr)")
+      throw QuickPkgError.pkgbuildFailed("productbuild failed (\(result.exitCode)) \(result.stderr)")
     }
   }
 }

Sources/quickpkg/QuickPkg.swift

@@ -35,13 +35,13 @@ struct QuickPkg: AsyncParsableCommand {
 
   // MARK: - Package Options
 
-  @Option(name: .customLong("install-location"), help: "Install location (default: /Applications)")
+  @Option(name: .customLong("install-location"), help: "Install location")
   var installLocation: String = "/Applications"
 
   @Option(help: "Ownership setting: recommended, preserve, or preserve-other")
   var ownership: Ownership?
 
-  @Option(help: "Compression type: latest or legacy (default: latest)")
+  @Option(help: "Compression type: latest or legacy")
   var compression: Compression = .latest
 
   @Option(name: [.customLong("output"), .customLong("out"), .short],
@@ -50,12 +50,15 @@ struct QuickPkg: AsyncParsableCommand {
 
   // MARK: - Flags
 
-  @Flag(inversion: .prefixedNo, help: "Clean up temp files (default: true)")
+  @Flag(inversion: .prefixedNo, help: "Clean up temp files")
   var clean: Bool = true
 
-  @Flag(inversion: .prefixedNo, help: "Make package relocatable (default: false)")
+  @Flag(inversion: .prefixedNo, help: "Make package relocatable")
   var relocatable: Bool = false
 
+  @Flag(exclusivity: .exclusive)
+  var packageType: PackageType = .distribution
+
   // MARK: - Signing Options
 
   @Option(help: "Signing identity for the package")
@@ -260,6 +263,7 @@ struct QuickPkg: AsyncParsableCommand {
     try await packageBuilder.build(
       payloadDir: payloadDir,
       outputPath: outputPath,
+      name: metadata.name,
       identifier: metadata.identifier,
       version: metadata.version,
       installLocation: installLocation,
@@ -268,6 +272,7 @@ struct QuickPkg: AsyncParsableCommand {
       compression: compression,
       relocatable: relocatable,
       minOSVersion: metadata.minimumSystemVersion,
+      packageType: packageType,
       sign: sign,
       keychain: keychain,
       cert: cert,