Remove OpenFoundation dependency (OpenSwiftUIProject#36)

* Remove OpenFoundation dependency * Update TargetConditionals
Lagrange1813 · Feb 16, 2024 · ce294c1 · ce294c1
1 parent ea17b0a
commit ce294c1
Show file tree

Hide file tree

Showing 10 changed files with 369 additions and 35 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -1,21 +1,12 @@
 {
   "pins" : [
-    {
-      "identity" : "openfoundation",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/OpenSwiftUIProject/OpenFoundation",
-      "state" : {
-        "revision" : "cd2cdb300d53e3e68fda8b690a703a7c5096d9d0",
-        "version" : "0.0.2"
-      }
-    },
     {
       "identity" : "opengraph",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/OpenSwiftUIProject/OpenGraph",
       "state" : {
         "branch" : "main",
-        "revision" : "d4f467d9780fcca4c268a1242a8ae90f61377c3d"
+        "revision" : "8f0376278186b6e24e8d7a07a560f3efaa2fef1d"
       }
     },
     {

diff --git a/Package.swift b/Package.swift
@@ -57,8 +57,7 @@ let package = Package(
         ),
         // C Shims for OpenSwiftUI
         .target(
-            name: "OpenSwiftUIShims",
-            dependencies: [.product(name: "OpenFoundation", package: "OpenFoundation")]
+            name: "OpenSwiftUIShims"
         ),
         .binaryTarget(name: "CoreServices", path: "PrivateFrameworks/CoreServices.xcframework"),
         openSwiftUITarget,
@@ -164,12 +163,10 @@ if compatibilityTestCondition {
 let useLocalDeps = envEnable("OPENSWIFTUI_USE_LOCAL_DEPS")
 if useLocalDeps {
     package.dependencies += [
-        .package(path: "../OpenFoundation"),
         .package(path: "../OpenGraph"),
     ]
 } else {
     package.dependencies += [
-        .package(url: "https://github.com/OpenSwiftUIProject/OpenFoundation", from: "0.0.1"),
         // FIXME: on Linux platform: OG contains unsafe build flags which prevents us using version dependency
         .package(url: "https://github.com/OpenSwiftUIProject/OpenGraph", branch: "main"),
     ]

diff --git a/Sources/OpenSwiftUIShims/ProtocolDescriptor.c b/Sources/OpenSwiftUIShims/ProtocolDescriptor.c
@@ -7,18 +7,18 @@
 
 #include "ProtocolDescriptor.h"
 
-OF_EXPORT
+OPENSWIFTUI_EXPORT
 const void *$s11OpenSwiftUI4ViewMp;
 
-OF_EXPORT
+OPENSWIFTUI_EXPORT
 const void *_viewProtocolDescriptor(void) {
     return &$s11OpenSwiftUI4ViewMp;
 }
 
-OF_EXPORT
+OPENSWIFTUI_EXPORT
 const void *$s11OpenSwiftUI12ViewModifierMp;
 
-OF_EXPORT
+OPENSWIFTUI_EXPORT
 const void *_viewModifierProtocolDescriptor(void) {
     return &$s11OpenSwiftUI12ViewModifierMp;
 }
diff --git a/Sources/OpenSwiftUIShims/dyld_Private.c b/Sources/OpenSwiftUIShims/dyld_Private.c
@@ -7,7 +7,7 @@
 
 #include "dyld_Private.h"
 
-#if !TARGET_OS_DARWIN
+#if !OPENSWIFTUI_TARGET_OS_DARWIN
 bool dyld_program_sdk_at_least(dyld_build_version_t version) {
     return true;
 }

diff --git a/Sources/OpenSwiftUIShims/include/LockedPointer.h b/Sources/OpenSwiftUIShims/include/LockedPointer.h
@@ -8,25 +8,27 @@
 #ifndef LockedPointer_h
 #define LockedPointer_h
 
-#include <OpenFoundation/OpenFoundation.h>
+#include "OpenSwiftUIBase.h"
 
 #if __has_include(<os/lock.h>)
 #include <os/lock.h>
 #define OPENSWIFTUI_LOCK_T os_unfair_lock
 #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 TARGET_OS_LINUX
+#elif OPENSWIFTUI_TARGET_OS_LINUX
 #define OPENSWIFTUI_LOCK_T int32_t
 #include <stdint.h>
 #include <unistd.h>
-OF_INLINE void __OPENSWIFTUI_Lock(volatile OPENSWIFTUI_LOCK_T * _Nonnull lock) {
+OPENSWIFTUI_INLINE
+void __OPENSWIFTUI_Lock(volatile OPENSWIFTUI_LOCK_T * _Nonnull lock) {
   while (__sync_val_compare_and_swap(lock, 0, ~0) != 0) {
     sleep(0);
   }
 }
 
-OF_INLINE void __OPENSWIFTUI_Unlock(volatile OPENSWIFTUI_LOCK_T * _Nonnull lock) {
+OPENSWIFTUI_INLINE
+void __OPENSWIFTUI_Unlock(volatile OPENSWIFTUI_LOCK_T * _Nonnull lock) {
   __sync_synchronize();
   *lock = 0;
 }

diff --git a/Sources/OpenSwiftUIShims/include/OpenSwiftUIBase.h b/Sources/OpenSwiftUIShims/include/OpenSwiftUIBase.h
@@ -0,0 +1,70 @@
+//
+//  OpenSwiftUIBase.h
+//  
+//
+//  Created by Kyle on 2024/2/16.
+//
+
+#ifndef OpenSwiftUIBase_h
+#define OpenSwiftUIBase_h
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include "OpenSwiftUITargetConditionals.h"
+
+#if defined(__cplusplus)
+#define OPENSWIFTUI_INLINE inline
+#else
+#define OPENSWIFTUI_INLINE
+#endif
+
+#if defined(__cplusplus)
+#define OPENSWIFTUI_EXTERN_C_BEGIN extern "C" {
+#define OPENSWIFTUI_EXTERN_C_END   }
+#else
+#define OPENSWIFTUI_EXTERN_C_BEGIN
+#define OPENSWIFTUI_EXTERN_C_END
+#endif
+
+#if __has_feature(assume_nonnull)
+#define OPENSWIFTUI_ASSUME_NONNULL_BEGIN _Pragma("clang assume_nonnull begin")
+#define OPENSWIFTUI_ASSUME_NONNULL_END   _Pragma("clang assume_nonnull end")
+#else
+#define OPENSWIFTUI_ASSUME_NONNULL_BEGIN
+#define OPENSWIFTUI_ASSUME_NONNULL_END
+#endif
+
+#if OPENSWIFTUI_TARGET_OS_WIN32
+    #if defined(__cplusplus)
+        #define _OPENSWIFTUI_EXTERN extern "C"
+    #else
+        #define _OPENSWIFTUI_EXTERN extern
+    #endif
+
+    #if defined(_WINDLL)
+        #if defined(OPENSWIFTUI_EXPORTS)
+            #define OPENSWIFTUI_EXPORT _OPENSWIFTUI_EXTERN __declspec(dllexport)
+        #else
+            #define OPENSWIFTUI_EXPORT _OPENSWIFTUI_EXTERN __declspec(dllimport)
+        #endif
+    #else
+        #define OPENSWIFTUI_EXPORT _OPENSWIFTUI_EXTERN
+    #endif
+#else
+#define OPENSWIFTUI_EXPORT extern
+#endif
+
+#if __has_attribute(swift_private)
+# define OPENSWIFTUI_REFINED_FOR_SWIFT __attribute__((swift_private))
+#else
+# define OPENSWIFTUI_REFINED_FOR_SWIFT
+#endif
+
+#if __has_attribute(swift_name)
+# define OPENSWIFTUI_SWIFT_NAME(_name) __attribute__((swift_name(#_name)))
+#else
+# define OPENSWIFTUI_SWIFT_NAME(_name)
+#endif
+
+#endif /* OpenSwiftUIBase_h */