merge: metadata-generator llvm 13.0.1 (#164)

feat: update metadata generator to work with llvm 13.0.1 and CLANG_ENABLE_MODULES

Author: rigor789

.gitignore

@@ -43,3 +43,5 @@ package-lock.json
 *.pyc
 v8
 .npmrc
+
+llvm/

NativeScript/NativeScript-Prefix.pch

@@ -1,7 +1,7 @@
 #ifndef NativeScript_Prefix_pch
 #define NativeScript_Prefix_pch
 
-#define NATIVESCRIPT_VERSION "8.2.4-alpha.1"
+#define NATIVESCRIPT_VERSION "8.3.0-alpha.0"
 
 #ifdef DEBUG
 #define SIZEOF_OFF_T 8

README.md

@@ -5,13 +5,20 @@ To start diving into the v8 iOS runtime make sure you have XCode and [Homebrew](
 # Install CMake
 brew install cmake
 
+# To avoid errors, you might need to link cmake to: /usr/local/bin/cmake
+# xcode doesn't read your profile during the build step, which causes it to ignore the PATH
+sudo ln -s /usr/local/bin/cmake $(which cmake)
+
 # Clone repo
 git clone https://github.com/NativeScript/ns-v8ios-runtime.git
 
 # Initialize and clone the submodules
 cd ns-v8ios-runtime
 git submodule update --init
 
+# Ensure that you have the required llvm binaries for building the metadata generator
+./download_llvm.sh
+
 # Open the runtime in XCode
 open v8ios.xcodeproj
 ```

build_metadata_generator.sh

@@ -1,26 +1,30 @@
 #!/bin/bash
 set -e
+source "$(dirname "$0")/build_utils.sh"
+
+./download_llvm.sh
+
+# try to build in the amount of threads available
+# change this to 1 if you want single threaded builds
+NUMJOBS=$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 1)
 
 function build {
     rm -rf build
     mkdir build
-    pushd "build"
-    cmake -DCMAKE_BUILD_TYPE=Release -DMETADATA_BINARY_ARCH=$1 -DCMAKE_OSX_ARCHITECTURES=$1 ../
-    make clean
-    make
-    cp ../build-step-metadata-generator.py bin
-    popd
+    cmake -B build -DCMAKE_BUILD_TYPE=Release -DMETADATA_BINARY_ARCH=$1 -DCMAKE_OSX_ARCHITECTURES=$1
+    cmake --build build --target clean
+    cmake --build build -j$NUMJOBS
     mkdir "dist/$1"
     cp -r "build/bin" "dist/$1"
 }
 
 pushd "metadata-generator"
 rm -rf dist
 mkdir dist
-echo "Building metadata generator for x86_64 ..."
+checkpoint "Building metadata generator for x86_64 ..."
 build "x86_64"
 
-echo "Building metadata generator for arm64 ..."
+checkpoint "Building metadata generator for arm64 ..."
 build "arm64"
 rm -rf build
 popd

build_nativescript.sh

@@ -1,16 +1,20 @@
 #!/bin/bash
 set -e
+source "$(dirname "$0")/build_utils.sh"
 
 DEV_TEAM=${DEVELOPMENT_TEAM:-}
 DIST=$(PWD)/dist
 mkdir -p $DIST
 
 mkdir -p $DIST/intermediates
 
-echo "Cleanup"
-xcodebuild -project v8ios.xcodeproj -target "NativeScript" -configuration Release clean
+checkpoint "Cleanup NativeScript"
+xcodebuild -project v8ios.xcodeproj \
+           -target "NativeScript" \
+           -configuration Release clean \
+           -quiet
 
-echo "Building for Mac Catalyst"
+checkpoint "Building NativeScript for Mac Catalyst"
 xcodebuild archive -project v8ios.xcodeproj \
                    -scheme "NativeScript" \
                    -configuration Release \
@@ -19,7 +23,7 @@ xcodebuild archive -project v8ios.xcodeproj \
                    SKIP_INSTALL=NO \
                    -archivePath $DIST/intermediates/NativeScript.maccatalyst.xcarchive
 
-# echo "Building for x86_64 iphone simulator"
+# checkpoint "Building for x86_64 iphone simulator"
 # xcodebuild archive -project v8ios.xcodeproj \
 #                    -scheme "NativeScript" \
 #                    -configuration Release \
@@ -30,7 +34,7 @@ xcodebuild archive -project v8ios.xcodeproj \
 #                    SKIP_INSTALL=NO \
 #                    -archivePath $DIST/NativeScript.x86_64-iphonesimulator.xcarchive
 
-# echo "Building for ARM64 iphone simulator"
+# checkpoint "Building for ARM64 iphone simulator"
 # xcodebuild archive -project v8ios.xcodeproj \
 #                    -scheme "NativeScript" \
 #                    -configuration Release \
@@ -41,25 +45,26 @@ xcodebuild archive -project v8ios.xcodeproj \
 #                    SKIP_INSTALL=NO \
 #                    -archivePath $DIST/NativeScript.arm64-iphonesimulator.xcarchive
 
-echo "Building for iphone simulators (multi-arch)"
+checkpoint "Building NativeScript for iphone simulators (multi-arch)"
 xcodebuild archive -project v8ios.xcodeproj \
                    -scheme "NativeScript" \
                    -configuration Release \
+                   -destination "generic/platform=iOS Simulator" \
                    -sdk iphonesimulator \
-                   -arch x86_64 \
-                   -arch arm64 \
                    -quiet \
+                   EXCLUDED_ARCHS="i386" \
                    DEVELOPMENT_TEAM=$DEV_TEAM \
                    SKIP_INSTALL=NO \
                    -archivePath $DIST/intermediates/NativeScript.iphonesimulator.xcarchive
 
-echo "Building for ARM64 device"
+checkpoint "Building NativeScript for ARM64 device"
 xcodebuild archive -project v8ios.xcodeproj \
                    -scheme "NativeScript" \
                    -configuration Release \
-                   -arch arm64 \
+                   -destination "generic/platform=iOS" \
                    -sdk iphoneos \
                    -quiet \
+                   EXCLUDED_ARCHS="armv7" \
                    DEVELOPMENT_TEAM=$DEV_TEAM \
                    SKIP_INSTALL=NO \
                    -archivePath $DIST/intermediates/NativeScript.iphoneos.xcarchive
@@ -79,7 +84,7 @@ xcodebuild archive -project v8ios.xcodeproj \
 #     -output \
 #     "$DIST/NativeScript.iphonesimulator.xcarchive/Products/Library/Frameworks/NativeScript.framework/NativeScript"
 
-echo "Creating NativeScript.xcframework"
+checkpoint "Creating NativeScript.xcframework"
 OUTPUT_DIR="$DIST/NativeScript.xcframework"
 rm -rf $OUTPUT_DIR
 xcodebuild -create-xcframework \

build_tklivesync.sh

@@ -1,15 +1,21 @@
 #!/bin/bash
 set -e
+source "$(dirname "$0")/build_utils.sh"
 
 DIST=$(PWD)/dist
 mkdir -p $DIST
 
 mkdir -p $DIST/intermediates
 
 #cleanup
-xcodebuild -project v8ios.xcodeproj -target TKLiveSync -configuration Release clean
+checkpoint "Cleanup TKLiveSync"
+xcodebuild -project v8ios.xcodeproj \
+           -target TKLiveSync \
+           -configuration Release clean \
+           -quiet
 
 #generates library for Mac Catalyst target
+checkpoint "Building TKLiveSync for Mac Catalyst"
 xcodebuild archive -project v8ios.xcodeproj \
                    -scheme TKLiveSync \
                    -configuration Release \
@@ -38,20 +44,22 @@ xcodebuild archive -project v8ios.xcodeproj \
 #                    -archivePath $DIST/TKLiveSync.arm64-iphonesimulator.xcarchive
 
 # generates library for simulator targets (usually includes arm64, x86_64)
+checkpoint "Building TKLiveSync for iphone simulators (multi-arch)"
 xcodebuild archive -project v8ios.xcodeproj \
                    -scheme TKLiveSync \
                    -configuration Release \
+                   -destination "generic/platform=iOS Simulator" \
                    -sdk iphonesimulator \
-                   -arch x86_64 \
-                   -arch arm64 \
                    -quiet \
                    SKIP_INSTALL=NO \
                    -archivePath $DIST/intermediates/TKLiveSync.iphonesimulator.xcarchive
 
 #generates library for device target
+checkpoint "Building TKLiveSync for ARM64 device"
 xcodebuild archive -project v8ios.xcodeproj \
                    -scheme TKLiveSync \
                    -configuration Release \
+                   -destination "generic/platform=iOS" \
                    -sdk iphoneos \
                    -quiet \
                    SKIP_INSTALL=NO \
@@ -77,6 +85,7 @@ rm -rf "${OUTPUT_PATH}"
 #     "$DIST/TKLiveSync.iphonesimulator.xcarchive/Products/Library/Frameworks/TKLiveSync.framework/TKLiveSync"
 
 #Creates xcframework
+checkpoint "Creating TKLiveSync.xcframework"
 xcodebuild -create-xcframework \
            -framework "$DIST/intermediates/TKLiveSync.maccatalyst.xcarchive/Products/Library/Frameworks/TKLiveSync.framework" \
            -debug-symbols "$DIST/intermediates/TKLiveSync.maccatalyst.xcarchive/dSYMs/TKLiveSync.framework.dSYM" \

build_utils.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+set -e
+
+# include this in other bash scripts with the following line:
+#
+# source "$(dirname "$0")/build_utils.sh"
+#
+
+# Prints a timestamp + title for a step/section
+function checkpoint {
+    local delimiter="--------------------------------------------------------------------------------"
+
+    echo ""
+    echo ""
+    echo "$delimiter"
+    echo "--- $(date +'%T') --- $1 "
+    echo "$delimiter"
+    echo ""
+}

download_llvm.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+set -e
+source "$(dirname "$0")/build_utils.sh"
+
+LLVM_VERSION="13.0.1"
+
+function download_llvm() {
+    checkpoint "Downloading llvm (version $LLVM_VERSION)..."
+    mkdir -p /tmp/llvm-dl/
+    curl -L https://github.com/NativeScript/ios-llvm/releases/download/v$LLVM_VERSION/llvm-$LLVM_VERSION.tgz -o /tmp/llvm-dl/llvm-$LLVM_VERSION.tgz
+    mkdir -p ./llvm/
+    checkpoint 'extracting llvm...'
+    tar -xzf /tmp/llvm-dl/llvm-$LLVM_VERSION.tgz -C ./llvm/
+}
+
+if [ ! -d "./llvm/$LLVM_VERSION" ]; then
+    download_llvm
+fi