chore: improve build scripts

Author: DjDeveloperr

NativeScript/CMakeLists.txt

@@ -20,6 +20,11 @@ set(TARGET_PLATFORM "macos" CACHE STRING "Target platform for the Objective-C br
 set(TARGET_ENGINE "v8" CACHE STRING "Target JS engine for the NativeScript runtime")
 set(METADATA_SIZE 0 CACHE STRING "Size of embedded metadata in bytes")
 set(BUILD_CLI_BINARY OFF CACHE BOOL "Build the NativeScript CLI binary")
+set(BUILD_MACOS_NODE_API OFF CACHE BOOL "Build the NativeScript macOS Node API dylib")
+
+if (BUILD_MACOS_NODE_API)
+  set(BUILD_FRAMEWORK OFF)
+endif()
 
 if(TARGET_PLATFORM STREQUAL "ios")
   set(CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "13.0")
@@ -93,6 +98,10 @@ else()
   set(GENERIC_NAPI TRUE)
 endif()
 
+if(BUILD_MACOS_NODE_API)
+  set(GENERIC_NAPI TRUE)
+endif()
+
 message(STATUS "TARGET_PLATFORM = ${TARGET_PLATFORM}")
 message(STATUS "TARGET_ENGINE = ${TARGET_ENGINE}")
 message(STATUS "ENABLE_JS_RUNTIME = ${ENABLE_JS_RUNTIME}")

build_nativescript.sh

@@ -9,6 +9,7 @@ BUILD_VISION=$(to_bool ${BUILD_VISION:=false}) # disable by default for now
 BUILD_MACOS=$(to_bool ${BUILD_MACOS:=false}) # disable by default for now
 VERBOSE=$(to_bool ${VERBOSE:=false})
 BUILD_MACOS_CLI=$(to_bool ${BUILD_MACOS_CLI:=false})
+BUILD_MACOS_NODE_API=$(to_bool ${BUILD_MACOS_NODE_API:=false})
 EMBED_METADATA=$(to_bool ${EMBED_METADATA:=false})
 CONFIG_BUILD=RelWithDebInfo
 
@@ -22,11 +23,13 @@ for arg in $@; do
     --sim|--simulator) BUILD_SIMULATOR=true ;;
     --no-sim|--no-simulator) BUILD_SIMULATOR=false ;;
     --iphone|--device) BUILD_IPHONE=true ;;
-    --no-iphone|--no-device) BUILD_IPHONE=false ;;
+    --no-iphone|--no-device|--no-phone|--no-ios) BUILD_IPHONE=false ;;
     --xr|--vision) BUILD_VISION=true ;;
     --no-xr|--no-vision) BUILD_VISION=false ;;
     --macos) BUILD_MACOS=true ;;
     --no-macos) BUILD_MACOS=false ;;
+    --macos-napi) BUILD_MACOS_NODE_API=true ;;
+    --no-macos-napi) BUILD_MACOS_NODE_API=false ;;
     --macos-cli) BUILD_MACOS_CLI=true ;;
     --no-macos-cli) BUILD_MACOS_CLI=false ;;
     --verbose|-v) VERBOSE=true ;;
@@ -35,7 +38,7 @@ for arg in $@; do
     --jsc) TARGET_ENGINE=jsc ;;
     --embed-metadata) EMBED_METADATA=true ;;
     --hermes) TARGET_ENGINE=hermes ;;
-    --no-engine) TARGET_ENGINE=none ;;
+    --no-engine|--generic-napi) TARGET_ENGINE=none ;;
     *) ;;
   esac
 done
@@ -62,9 +65,14 @@ function cmake_build () {
     is_macos_cli=true
   fi
 
+  if [ "$platform" == "macos-napi" ]; then
+    platform="macos"
+    is_macos_napi=true
+  fi
+
   mkdir -p $DIST/intermediates/$platform
 
-  if $EMBED_METADATA || $is_macos_cli; then
+  if $EMBED_METADATA || $is_macos_cli || $is_macos_napi; then
 
     for arch in "${archs[@]}"; do
 
@@ -74,7 +82,7 @@ function cmake_build () {
 
   fi
 
-  cmake -S=./NativeScript -B=$DIST/intermediates/$platform -GXcode -DTARGET_PLATFORM=$platform -DTARGET_ENGINE=$TARGET_ENGINE -DMETADATA_SIZE=$METADATA_SIZE -DBUILD_CLI_BINARY=$is_macos_cli
+  cmake -S=./NativeScript -B=$DIST/intermediates/$platform -GXcode -DTARGET_PLATFORM=$platform -DTARGET_ENGINE=$TARGET_ENGINE -DMETADATA_SIZE=$METADATA_SIZE -DBUILD_CLI_BINARY=$is_macos_cli -DBUILD_MACOS_NODE_API=$is_macos_napi
 
   cmake --build $DIST/intermediates/$platform --config $CONFIG_BUILD
 }
@@ -127,6 +135,12 @@ cmake_build macos-cli x86_64 arm64
 
 fi
 
+if $BUILD_MACOS_NODE_API; then
+  checkpoint "Building NativeScript for macOS Node API"
+
+  cmake_build macos-napi x86_64 arm64
+fi
+
 XCFRAMEWORKS=()
 if $BUILD_CATALYST; then
   XCFRAMEWORKS+=( -framework "$DIST/intermediates/catalyst/$CONFIG_BUILD-maccatalyst/NativeScript.framework"
@@ -143,6 +157,11 @@ 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" )
@@ -175,9 +194,6 @@ fi
 # 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)"
 
@@ -186,12 +202,14 @@ if $BUILD_MACOS; then
     OUTPUT_DIR="packages/macos/build/$CONFIG_BUILD/NativeScript.apple.node"
     rm -rf $OUTPUT_DIR
     deno run -A ./scripts/build_xcframework.mts --output "$OUTPUT_DIR" ${XCFRAMEWORKS[@]}
-  else
-    checkpoint "Creating NativeScript.node for macOS"
-    cp -r "$DIST/intermediates/macos/$CONFIG_BUILD/libNativeScript.dylib" "$DIST/NativeScript.node"
   fi
 fi
 
+if $BUILD_MACOS_NODE_API; then
+  checkpoint "Creating NativeScript.node for macOS"
+  cp -r "$DIST/intermediates/macos/$CONFIG_BUILD/libNativeScript.dylib" "$DIST/NativeScript.node"
+fi
+
 if $BUILD_MACOS_CLI; then
 
 checkpoint "Creating NativeScript CLI"

package.json

@@ -28,10 +28,16 @@
     "update-version": "./update_version.sh",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
     "version": "npm run changelog && git add CHANGELOG.md",
-    "metagen": "node scripts/metagen.js",
     "build-libffi": "node scripts/build_libffi.js",
     "build-metagen": "./build_metadata_generator.sh",
-    "build": "./build_nativescript.sh --quickjs"
+    "metagen": "node scripts/metagen.js",
+    "build": "./build_nativescript.sh",
+    "build:ios": "./build_nativescript.sh --iphone --no-simulator",
+    "build:ios-sim": "./build_nativescript.sh --no-iphone --simulator",
+    "build:macos": "./build_nativescript.sh --macos --no-iphone --no-simulator",
+    "build:macos-cli": "./build_nativescript.sh --no-iphone --no-simulator --macos-cli",
+    "build:macos-napi": "./build_nativescript.sh --no-iphone --no-simulator --macos-napi",
+    "nsr": "./dist/nsr"
   },
   "license": "Apache-2.0",
   "devDependencies": {