Fix os(WASI) build issue

Kyle-Ye · Kyle-Ye · commit 2b3ce5b91d28 · 2024-02-19T02:05:53.000+08:00
diff --git a/Sources/OpenSwiftUI/AppStructure/AppOrganization/TODO/OpenSwiftUIApplication.swift b/Sources/OpenSwiftUI/AppStructure/AppOrganization/TODO/OpenSwiftUIApplication.swift
@@ -61,12 +61,13 @@ private func KitRendererCommon() -> Never {
     #elseif os(macOS)
     // FIXME
     let code = NSApplicationMain(argc, argv)
-    #elseif os(Linux)
+    #else
     let code: Int32 = 1
     #endif
     exit(code)
 }
 
+#if canImport(Darwin)
 func currentAppName() -> String {
     if let name = Bundle.main.localizedValue(for: "CFBundleDisplayName") {
         return name
@@ -90,3 +91,4 @@ extension Bundle {
         }
     }
 }
+#endif
diff --git a/Sources/OpenSwiftUI/Internal/Graph/TODO/_GraphInputs.swift b/Sources/OpenSwiftUI/Internal/Graph/TODO/_GraphInputs.swift
@@ -9,7 +9,7 @@ public struct _GraphInputs {
     var changedDebugProperties: _ViewDebug.Properties
     var options: _GraphInputs.Options
     // FIXME: Compile crash on Linux
-    #if !os(Linux)
+    #if canImport(Darwin)
     var mergedInputs: Set<OGAttribute>
     #endif
 }
diff --git a/Sources/OpenSwiftUI/Internal/Other/EnvironmentHelper.swift b/Sources/OpenSwiftUI/Internal/Other/EnvironmentHelper.swift
@@ -2,6 +2,8 @@
 import Darwin
 #elseif canImport(Glibc)
 import Glibc
+#elseif os(WASI)
+import WASILibc
 #else
 #error("Unsupported Platform")
 #endif
diff --git a/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/AlignmentID.swift b/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/AlignmentID.swift
@@ -8,7 +8,7 @@
 
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/HorizontalAlignment.swift b/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/HorizontalAlignment.swift
@@ -9,7 +9,7 @@
 
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/VerticalAlignment.swift b/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/VerticalAlignment.swift
@@ -9,7 +9,7 @@
 
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/ViewDimensions.swift b/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/ViewDimensions.swift
@@ -8,7 +8,7 @@
 
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Edge/EdgeInsets.swift b/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Edge/EdgeInsets.swift
@@ -8,7 +8,7 @@
 
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/Layout/LayoutFundamentals/Stack/HStack.swift b/Sources/OpenSwiftUI/Layout/LayoutFundamentals/Stack/HStack.swift
@@ -1,6 +1,6 @@
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/Layout/LayoutFundamentals/Stack/_HStackLayout.swift b/Sources/OpenSwiftUI/Layout/LayoutFundamentals/Stack/_HStackLayout.swift
@@ -1,6 +1,6 @@
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/Layout/LayoutFundamentals/internal/LayoutComputer.swift b/Sources/OpenSwiftUI/Layout/LayoutFundamentals/internal/LayoutComputer.swift
@@ -8,7 +8,7 @@
 
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/Layout/LayoutFundamentals/internal/Spacing.swift b/Sources/OpenSwiftUI/Layout/LayoutFundamentals/internal/Spacing.swift
@@ -9,7 +9,7 @@
 
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/Layout/LayoutFundamentals/internal/_ProposedSize.swift b/Sources/OpenSwiftUI/Layout/LayoutFundamentals/internal/_ProposedSize.swift
@@ -8,7 +8,7 @@
 
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/Test/_BenchmarkHost.swift b/Sources/OpenSwiftUI/Test/_BenchmarkHost.swift
@@ -9,7 +9,7 @@
 
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/UIElements/Font/TODO/Font.swift b/Sources/OpenSwiftUI/UIElements/Font/TODO/Font.swift
@@ -1,6 +1,6 @@
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/UIElements/Text/TODO/Text.swift b/Sources/OpenSwiftUI/UIElements/Text/TODO/Text.swift
@@ -8,7 +8,7 @@
 
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/Views/Animations/TODO/Animatable.swift b/Sources/OpenSwiftUI/Views/Animations/TODO/Animatable.swift
@@ -44,7 +44,7 @@ extension Animatable where AnimatableData == EmptyAnimatableData {
 
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/Views/Animations/VectorArithmetic.swift b/Sources/OpenSwiftUI/Views/Animations/VectorArithmetic.swift
@@ -59,7 +59,7 @@ extension Double: VectorArithmetic {
 
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/Views/View/ViewTransform.swift b/Sources/OpenSwiftUI/Views/View/ViewTransform.swift
@@ -2,7 +2,7 @@
 
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/Views/View/_IdentifiedViewProxy.swift b/Sources/OpenSwiftUI/Views/View/_IdentifiedViewProxy.swift
@@ -1,6 +1,6 @@
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUIShims/include/LockedPointer.h b/Sources/OpenSwiftUIShims/include/LockedPointer.h
@@ -16,7 +16,7 @@
 #define OPENSWIFTUI_LOCK_INIT OS_UNFAIR_LOCK_INIT
 #define OPENSWIFTUI_LOCK_LOCK(lock) os_unfair_lock_lock(lock)
 #define OPENSWIFTUI_LOCK_UNLOCK(lock) os_unfair_lock_unlock(lock)
-#elif OPENSWIFTUI_TARGET_OS_LINUX
+#else
 #define OPENSWIFTUI_LOCK_T int32_t
 #include <stdint.h>
 #include <unistd.h>
diff --git a/Tests/OpenSwiftUITests/Layout/LayoutAdjustments/Alignment/AlignmentIDTests.swift b/Tests/OpenSwiftUITests/Layout/LayoutAdjustments/Alignment/AlignmentIDTests.swift
@@ -9,7 +9,7 @@
 import Testing
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Tests/OpenSwiftUITests/_ViewDebugTests.swift b/Tests/OpenSwiftUITests/_ViewDebugTests.swift
@@ -9,7 +9,7 @@
 import Testing
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -61,12 +61,13 @@ private func KitRendererCommon() -> Never {`
`61`	`61`	`#elseif os(macOS)`
`62`	`62`	`// FIXME`
`63`	`63`	`let code = NSApplicationMain(argc, argv)`
`64`		`- #elseif os(Linux)`
	`64`	`+ #else`
`65`	`65`	`let code: Int32 = 1`
`66`	`66`	`#endif`
`67`	`67`	`exit(code)`
`68`	`68`	`}`
`69`	`69`
	`70`	`+#if canImport(Darwin)`
`70`	`71`	`func currentAppName() -> String {`
`71`	`72`	`if let name = Bundle.main.localizedValue(for: "CFBundleDisplayName") {`
`72`	`73`	`return name`
`@@ -90,3 +91,4 @@ extension Bundle {`
`90`	`91`	`}`
`91`	`92`	`}`
`92`	`93`	`}`
	`94`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public struct _GraphInputs {`
`9`	`9`	`var changedDebugProperties: _ViewDebug.Properties`
`10`	`10`	`var options: _GraphInputs.Options`
`11`	`11`	`// FIXME: Compile crash on Linux`
`12`		`- #if !os(Linux)`
	`12`	`+ #if canImport(Darwin)`
`13`	`13`	`var mergedInputs: Set<OGAttribute>`
`14`	`14`	`#endif`
`15`	`15`	`}`