finally emitting NativeScript.apple.node for both iOS and macOS

Author: shirakaba

NativeScript/CMakeLists.txt

@@ -54,6 +54,10 @@ elseif(TARGET_PLATFORM STREQUAL "macos")
   set(TARGET_PLATFORM_SPEC "macos-arm64_x86_64")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTARGET_PLATFORM_MACOS")
 
+# Force dSYM generation for macOS (by default, they're embedded into the
+# binary itself, giving us a 14,981,336 byte / 15 MB binary)
+# set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "dwarf-with-dsym")
+# set(CMAKE_XCODE_ATTRIBUTE_DWARF_DSYM_FOLDER_PATH "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>")
 else()
   message(FATAL_ERROR "Unknown target platform: ${TARGET_PLATFORM}")
   return()
@@ -302,7 +306,7 @@ if(TARGET_PLATFORM_MACOS)
   # Convert the Info.plist from binary format to XML format.
   # This seemed to unblock a build error when using in React Native.
   add_custom_command(TARGET ${NAME} POST_BUILD
-    COMMAND plutil -convert xml1 $<TARGET_FILE_DIR:${NAME}>/Info.plist
+    COMMAND plutil -convert xml1 $<TARGET_FILE_DIR:${NAME}>/Resources/Info.plist
   )
   set(METADATA_FILE "metadata.macos.nsmd")
 elseif(TARGET_PLATFORM_IOS)

build_nativescript.sh

@@ -105,8 +105,6 @@ checkpoint "Building NativeScript for macOS"
 
 cmake_build macos x86_64 arm64
 
-cp "$DIST/intermediates/macos/$CONFIG_BUILD/libNativeScript.dylib" "$DIST/../packages/macos/dist/macos/NativeScript.node"
-
 fi
 
 if $BUILD_VISION; then
@@ -145,11 +143,6 @@ if $BUILD_IPHONE; then
                   -debug-symbols "$DIST/intermediates/ios/$CONFIG_BUILD-iphoneos/NativeScript.framework.dSYM" )
 fi
 
-if $BUILD_MACOS; then
-  XCFRAMEWORKS+=( -framework "$DIST/intermediates/macos/$CONFIG_BUILD/NativeScript.framework"
-                  -debug-symbols "$DIST/intermediates/macos/$CONFIG_BUILD/NativeScript.framework.dSYM" )
-fi
-
 if $BUILD_VISION; then
   XCFRAMEWORKS+=( -framework "$DIST/intermediates/visionos/$CONFIG_BUILD-xros/NativeScript.framework"
                   -debug-symbols "$DIST/intermediates/visionos/$CONFIG_BUILD-xros/NativeScript.framework.dSYM" )
@@ -176,7 +169,15 @@ if [[ -n "${XCFRAMEWORKS[@]}" ]]; then
   fi
 fi
 
+# We're currently distributing two separate packages:
+# 1. UIKit-based (@nativescript/ios-node-api)
+# 2. AppKit-based (@nativescript/macos-node-api)
+# As such, there's no point bundling both UIKit-based and AppKit-based into a
+# single XCFramework.
 if $BUILD_MACOS; then
+  XCFRAMEWORKS=( -framework "$DIST/intermediates/macos/$CONFIG_BUILD/NativeScript.framework"
+                  -debug-symbols "$DIST/intermediates/macos/$CONFIG_BUILD/NativeScript.framework.dSYM" )
+
   if [[ "$TARGET_ENGINE" == "none" ]]; then
     checkpoint "Creating the XCFramework for macOS (NativeScript.apple.node)"