Skip to content

armgit / xtool

Public Imported from GitHub
0

Cross-platform Xcode replacement. Build and deploy iOS apps with SwiftPM on Linux, Windows, macOS.

sdk: accept directories for tarball overrides (#385)

Anish Pallatif1eca85cf4fe
diff --git a/Sources/XToolSupport/SDKBuilder.swift b/Sources/XToolSupport/SDKBuilder.swift
index 11a9632..c0632c4 100644
--- a/Sources/XToolSupport/SDKBuilder.swift
+++ b/Sources/XToolSupport/SDKBuilder.swift
@@ -244,11 +244,33 @@ struct SDKBuilder {
)
if let envOverride, let path = ProcessInfo.processInfo.environment[envOverride] {
- let archive = URL(fileURLWithPath: path)
- print("[Extracting \(displayName)] \(archive.path)")
+ let source = URL(fileURLWithPath: path)
+ if source.dirExists {
+ print("[Copying \(displayName)] \(source.path)")
+ try await Subprocess.run(
+ .name("cp"),
+ arguments: ["-RL", "\(source.path)/.", "."],
+ workingDirectory: FilePath(directory),
+ output: .discarded,
+ error: .discarded,
+ )
+ .checkSuccess()
+ // later steps write into the copy
+ try await Subprocess.run(
+ .name("chmod"),
+ arguments: ["-R", "u+w", "."],
+ workingDirectory: FilePath(directory),
+ output: .discarded,
+ error: .discarded,
+ )
+ .checkSuccess()
+ return
+ }
+
+ print("[Extracting \(displayName)] \(source.path)")
try await Subprocess.run(
.name("tar"),
- arguments: ["xzf", archive.path],
+ arguments: ["xzf", source.path],
workingDirectory: FilePath(directory),
output: .discarded,
error: .discarded,