Exclude WASI from Windows build too

kateinoigakukun · kateinoigakukun · commit 45a723e13389 · 2024-07-01T23:31:36.000+09:00
diff --git a/Package.swift b/Package.swift
@@ -15,14 +15,6 @@ let package = Package(
             name: "WasmParser",
             targets: ["WasmParser"]
         ),
-        .library(
-            name: "WasmKitWASI",
-            targets: ["WasmKitWASI"]
-        ),
-        .library(
-            name: "WASI",
-            targets: ["WASI"]
-        ),
         .executable(
             name: "wasmkit-cli",
             targets: ["CLI"]
@@ -33,7 +25,6 @@ let package = Package(
             name: "CLI",
             dependencies: [
                 "WasmKit",
-                "WasmKitWASI",
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
                 .product(name: "SystemPackage", package: "swift-system"),
             ],
@@ -43,16 +34,10 @@ let package = Package(
             name: "WasmTypes",
             exclude: ["CMakeLists.txt"]
         ),
-        .target(
-            name: "WASI",
-            dependencies: ["WasmTypes", "SystemExtras"],
-            exclude: ["CMakeLists.txt"]
-        ),
         .target(
             name: "WasmKit",
             dependencies: [
                 "WasmParser",
-                "SystemExtras",
                 "WasmTypes",
                 .product(name: "SystemPackage", package: "swift-system"),
             ],
@@ -66,18 +51,6 @@ let package = Package(
             ],
             exclude: ["CMakeLists.txt"]
         ),
-        .target(
-            name: "WasmKitWASI",
-            dependencies: ["WasmKit", "WASI"],
-            exclude: ["CMakeLists.txt"]
-        ),
-        .target(
-            name: "SystemExtras",
-            dependencies: [
-                .product(name: "SystemPackage", package: "swift-system")
-            ],
-            exclude: ["CMakeLists.txt"]
-        ),
         .executableTarget(
             name: "Spectest",
             dependencies: [
@@ -94,10 +67,6 @@ let package = Package(
             name: "WasmParserTests",
             dependencies: ["WasmParser"]
         ),
-        .testTarget(
-            name: "WASITests",
-            dependencies: ["WASI"]
-        ),
     ],
     swiftLanguageVersions: [.v5]
 )
@@ -117,6 +86,57 @@ if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
 }
 
 #if !os(Windows)
+    // Add WASI-related products and targets
+    package.products.append(contentsOf: [
+        .library(
+            name: "WasmKitWASI",
+            targets: ["WasmKitWASI"]
+        ),
+        .library(
+            name: "WASI",
+            targets: ["WASI"]
+        ),
+    ])
+    package.targets.append(contentsOf: [
+        .target(
+            name: "WASI",
+            dependencies: ["WasmTypes", "SystemExtras"],
+            exclude: ["CMakeLists.txt"]
+        ),
+        .target(
+            name: "WasmKitWASI",
+            dependencies: ["WasmKit", "WASI"],
+            exclude: ["CMakeLists.txt"]
+        ),
+        .target(
+            name: "SystemExtras",
+            dependencies: [
+                .product(name: "SystemPackage", package: "swift-system")
+            ],
+            exclude: ["CMakeLists.txt"]
+        ),
+        .testTarget(
+            name: "WASITests",
+            dependencies: ["WASI"]
+        ),
+        .testTarget(
+            name: "WASITests",
+            dependencies: ["WASI"]
+        ),
+    ])
+    let targetDependenciesToAdd = [
+        "CLI": ["WasmKitWASI"],
+        "WasmKit": ["SystemExtras"],
+    ]
+    for (targetName, dependencies) in targetDependenciesToAdd {
+        if let target = package.targets.first(where: { $0.name == targetName }) {
+            target.dependencies += dependencies.map { .target(name: $0) }
+        } else {
+            fatalError("Target \(targetName) not found!?")
+        }
+    }
+
+    // Add WIT-related products and targets
     package.products.append(contentsOf: [
         .library(name: "WIT", targets: ["WIT"]),
         .library(name: "_CabiShims", targets: ["_CabiShims"]),
diff --git a/Sources/CLI/Run/Run.swift b/Sources/CLI/Run/Run.swift
@@ -1,6 +1,8 @@
 import ArgumentParser
 import SystemPackage
+#if canImport(WasmKitWASI)
 import WasmKitWASI
+#endif
 import WasmKit
 
 struct Run: ParsableCommand {
@@ -78,6 +80,7 @@ struct Run: ParsableCommand {
         }
     }
 
+    #if canImport(SystemExtras)
     func deriveInterceptor() throws -> (interceptor: GuestTimeProfiler, finalize: () -> Void)? {
         guard let outputPath = self.profileOutput else { return nil }
         let fileHandle = try FileDescriptor.open(
@@ -97,8 +100,16 @@ struct Run: ParsableCommand {
             }
         )
     }
+    #else
+    func deriveInterceptor() throws -> (interceptor: RuntimeInterceptor, finalize: () -> Void)? {
+        nil
+    }
+    #endif
 
     func instantiateWASI(module: Module, interceptor: RuntimeInterceptor?) throws -> () throws -> Void {
+        #if os(Windows)
+        fatalError("WASI is not supported on Windows")
+        #else
         // Flatten environment variables into a dictionary (Respect the last value if a key is duplicated)
         let environment = environment.reduce(into: [String: String]()) {
             $0[$1.key] = $1.value
@@ -113,6 +124,7 @@ struct Run: ParsableCommand {
             let exitCode = try wasi.start(moduleInstance, runtime: runtime)
             throw ExitCode(Int32(exitCode))
         }
+        #endif
     }
 
     func instantiateNonWASI(module: Module, interceptor: RuntimeInterceptor?) throws -> (() throws -> Void)? {
diff --git a/Sources/SystemExtras/Constants.swift b/Sources/SystemExtras/Constants.swift
@@ -19,9 +19,9 @@ internal var _AT_EACCESS: CInt { AT_EACCESS }
 internal var _AT_SYMLINK_NOFOLLOW: CInt { AT_SYMLINK_NOFOLLOW }
 @_alwaysEmitIntoClient
 internal var _AT_SYMLINK_FOLLOW: CInt { AT_SYMLINK_FOLLOW }
-#endif
 @_alwaysEmitIntoClient
 internal var _AT_REMOVEDIR: CInt { AT_REMOVEDIR }
+#endif
 #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
 @_alwaysEmitIntoClient
 internal var _AT_REALDEV: CInt { AT_REALDEV }
@@ -37,17 +37,20 @@ internal var _AT_NO_AUTOMOUNT: CInt { AT_NO_AUTOMOUNT }
 #endif
 */
 
+#if !os(Windows)
 @_alwaysEmitIntoClient
 internal var _F_GETFL: CInt { F_GETFL }
 @_alwaysEmitIntoClient
 internal var _O_DSYNC: CInt { O_DSYNC }
 @_alwaysEmitIntoClient
 internal var _O_SYNC: CInt { O_SYNC }
+#endif
 #if os(Linux)
 @_alwaysEmitIntoClient
 internal var _O_RSYNC: CInt { O_RSYNC }
 #endif
 
+#if !os(Windows)
 @_alwaysEmitIntoClient
 internal var _UTIME_NOW: CInt {
     #if os(Linux)
@@ -89,23 +92,26 @@ internal var _DT_LNK: CInt { CInt(DT_LNK) }
 internal var _DT_SOCK: CInt { CInt(DT_SOCK) }
 @_alwaysEmitIntoClient
 internal var _DT_WHT: CInt { CInt(DT_WHT) }
+#endif
 
 @_alwaysEmitIntoClient
 internal var _S_IFMT: CInterop.Mode { S_IFMT }
 @_alwaysEmitIntoClient
-internal var _S_IFIFO: CInterop.Mode { S_IFIFO }
-@_alwaysEmitIntoClient
 internal var _S_IFCHR: CInterop.Mode { S_IFCHR }
 @_alwaysEmitIntoClient
 internal var _S_IFDIR: CInterop.Mode { S_IFDIR }
 @_alwaysEmitIntoClient
-internal var _S_IFBLK: CInterop.Mode { S_IFBLK }
-@_alwaysEmitIntoClient
 internal var _S_IFREG: CInterop.Mode { S_IFREG }
+#if !os(Windows)
+@_alwaysEmitIntoClient
+internal var _S_IFIFO: CInterop.Mode { S_IFIFO }
+@_alwaysEmitIntoClient
+internal var _S_IFBLK: CInterop.Mode { S_IFBLK }
 @_alwaysEmitIntoClient
 internal var _S_IFLNK: CInterop.Mode { S_IFLNK }
 @_alwaysEmitIntoClient
 internal var _S_IFSOCK: CInterop.Mode { S_IFSOCK }
+#endif
 
 #if os(Linux)
 @_alwaysEmitIntoClient
diff --git a/Sources/SystemExtras/Syscalls.swift b/Sources/SystemExtras/Syscalls.swift
@@ -90,6 +90,9 @@ internal func system_symlinkat(
   return symlinkat(oldPath, newDirFd, newPath)
 }
 
+// ucrt does not provide `opendir` API
+#if !os(Windows)
+
 extension CInterop {
   #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
   public typealias DirP = UnsafeMutablePointer<DIR>
@@ -109,6 +112,7 @@ internal func system_fdopendir(_ fd: Int32) -> CInterop.DirP? {
 internal func system_readdir(_ dirp: CInterop.DirP) -> UnsafeMutablePointer<dirent>? {
   return readdir(dirp)
 }
+#endif
 
 #if !os(Windows)
 
diff --git a/Sources/WasmKit/Execution/Runtime/Profiler.swift b/Sources/WasmKit/Execution/Runtime/Profiler.swift
@@ -1,3 +1,4 @@
+#if canImport(SystemExtras)
 import SystemExtras
 import SystemPackage
 
@@ -116,3 +117,5 @@ private enum JSON {
         return output
     }
 }
+
+#endif

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`import ArgumentParser`
`2`	`2`	`import SystemPackage`
	`3`	`+#if canImport(WasmKitWASI)`
`3`	`4`	`import WasmKitWASI`
	`5`	`+#endif`
`4`	`6`	`import WasmKit`
`5`	`7`
`6`	`8`	`struct Run: ParsableCommand {`
`@@ -78,6 +80,7 @@ struct Run: ParsableCommand {`
`78`	`80`	`}`
`79`	`81`	`}`
`80`	`82`
	`83`	`+ #if canImport(SystemExtras)`
`81`	`84`	`func deriveInterceptor() throws -> (interceptor: GuestTimeProfiler, finalize: () -> Void)? {`
`82`	`85`	`guard let outputPath = self.profileOutput else { return nil }`
`83`	`86`	`let fileHandle = try FileDescriptor.open(`
`@@ -97,8 +100,16 @@ struct Run: ParsableCommand {`
`97`	`100`	`}`
`98`	`101`	`)`
`99`	`102`	`}`
	`103`	`+ #else`
	`104`	`+ func deriveInterceptor() throws -> (interceptor: RuntimeInterceptor, finalize: () -> Void)? {`
	`105`	`+ nil`
	`106`	`+ }`
	`107`	`+ #endif`
`100`	`108`
`101`	`109`	`func instantiateWASI(module: Module, interceptor: RuntimeInterceptor?) throws -> () throws -> Void {`
	`110`	`+ #if os(Windows)`
	`111`	`+ fatalError("WASI is not supported on Windows")`
	`112`	`+ #else`
`102`	`113`	`// Flatten environment variables into a dictionary (Respect the last value if a key is duplicated)`
`103`	`114`	`let environment = environment.reduce(into: [String: String]()) {`
`104`	`115`	`$0[$1.key] = $1.value`
`@@ -113,6 +124,7 @@ struct Run: ParsableCommand {`
`113`	`124`	`let exitCode = try wasi.start(moduleInstance, runtime: runtime)`
`114`	`125`	`throw ExitCode(Int32(exitCode))`
`115`	`126`	`}`
	`127`	`+ #endif`
`116`	`128`	`}`
`117`	`129`
`118`	`130`	`func instantiateNonWASI(module: Module, interceptor: RuntimeInterceptor?) throws -> (() throws -> Void)? {`
Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,9 @@ internal func system_symlinkat(`
`90`	`90`	`return symlinkat(oldPath, newDirFd, newPath)`
`91`	`91`	`}`
`92`	`92`
	`93`	+// ucrt does not provide `opendir` API
	`94`	`+#if !os(Windows)`
	`95`	`+`
`93`	`96`	`extension CInterop {`
`94`	`97`	`#if os(macOS) \|\| os(iOS) \|\| os(watchOS) \|\| os(tvOS)`
`95`	`98`	`public typealias DirP = UnsafeMutablePointer<DIR>`
`@@ -109,6 +112,7 @@ internal func system_fdopendir(_ fd: Int32) -> CInterop.DirP? {`
`109`	`112`	`internal func system_readdir(_ dirp: CInterop.DirP) -> UnsafeMutablePointer<dirent>? {`
`110`	`113`	`return readdir(dirp)`
`111`	`114`	`}`
	`115`	`+#endif`
`112`	`116`
`113`	`117`	`#if !os(Windows)`
`114`	`118`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#if canImport(SystemExtras)`
`1`	`2`	`import SystemExtras`
`2`	`3`	`import SystemPackage`
`3`	`4`
`@@ -116,3 +117,5 @@ private enum JSON {`
`116`	`117`	`return output`
`117`	`118`	`}`
`118`	`119`	`}`
	`120`	`+`
	`121`	`+#endif`