Cross-platform Xcode replacement. Build and deploy iOS apps with SwiftPM on Linux, Windows, macOS.
Support building for iOS simulator (#74)
Kabir Oberai3a4290c85ed4
diff --git a/Sources/PackLib/BuildSettings.swift b/Sources/PackLib/BuildSettings.swiftindex 5a1b5d1..8a3e09d 100644--- a/Sources/PackLib/BuildSettings.swift+++ b/Sources/PackLib/BuildSettings.swift@@ -15,15 +15,14 @@ public struct BuildSettings: Sendable {public init(configuration: BuildConfiguration,+ triple: String,packagePath: String = ".",options: [String] = []) async throws {self.packagePath = packagePathself.configuration = configurationself.options = options-- // TODO: allow customizing?- self.triple = "arm64-apple-ios"+ self.triple = triple// on macOS we don't explicitly install a Swift SDK but// SwiftPM vends "implicit" Darwin SDKs as of Swift 6.1,diff --git a/Sources/XToolSupport/DevCommand.swift b/Sources/XToolSupport/DevCommand.swiftindex 17c85c1..a53bf3e 100644--- a/Sources/XToolSupport/DevCommand.swift+++ b/Sources/XToolSupport/DevCommand.swift@@ -18,6 +18,9 @@ struct PackOperation {}}+ static let defaultTriple = "arm64-apple-ios"++ var triple: String?var buildOptions = BuildOptions(configuration: .debug)var xcode = false@@ -39,6 +42,7 @@ struct PackOperation {let buildSettings = try await BuildSettings(configuration: buildOptions.configuration,+ triple: triple ?? Self.defaultTriple,options: [])@@ -90,8 +94,16 @@ struct DevBuildCommand: AsyncParsableCommand {help: "Output a .ipa file instead of a .app") var ipa = false+ @Option(+ help: ArgumentHelp(+ "Custom target triple to build for",+ discussion: "Defaults to '\(PackOperation.defaultTriple)'"+ )+ ) var triple: String?+func run() async throws {let url = try await PackOperation(+ triple: triple,buildOptions: packOptions).run()@@ -136,10 +148,39 @@ struct DevRunCommand: AsyncParsableCommand {@OptionGroup var packOptions: PackOperation.BuildOptions+ #if os(macOS)+ @Flag(+ name: .shortAndLong,+ help: "Target the iOS Simulator"+ ) var simulator = false++ var triple: String? {+ if simulator {+ #if arch(arm64)+ return "arm64-apple-ios-simulator"+ #elseif arch(x86_64)+ return "x86_64-apple-ios-simulator"+ #else+ #error("Unsupported architecture")+ #endif+ }+ return nil+ }+ #else+ var triple: String? { nil }+ #endif+@OptionGroup var connectionOptions: ConnectionOptionsfunc run() async throws {- let output = try await PackOperation(buildOptions: packOptions).run()+ let output = try await PackOperation(triple: triple, buildOptions: packOptions).run()++ #if os(macOS)+ if simulator {+ try await SimInstallOperation(path: output).run()+ return+ }+ #endiflet token = try AuthToken.saved()@@ -175,3 +216,20 @@ struct DevCommand: AsyncParsableCommand {}extension BuildConfiguration: ExpressibleByArgument {}++#if os(macOS)+struct SimInstallOperation {+ var path: URL++ // TODO: allow customizing this+ var simulator = "booted"++ func run() async throws {+ let process = Process()+ process.executableURL = URL(fileURLWithPath: "/usr/bin/xcrun")+ process.arguments = ["simctl", "install", simulator, path.path]+ try await process.runUntilExit()+ print("Installed to simulator")+ }+}+#endif