Refactor Makefile and Workflow file

Gioee · Gioee · commit ffe1fc405f81 · 2025-08-07T15:56:24.000+02:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,64 +8,84 @@ permissions:
 jobs:
   build:
     runs-on: ${{ matrix.os }}
-    name: ${{ matrix.name }}${{ matrix.arch && format('-{0}', matrix.arch) || '' }} build${{ matrix.arch != 'arm64-v8a' && matrix.name != 'isim' && matrix.name != 'ios' && ' + test' || ''}}
+    container: ${{ matrix.container && matrix.container || '' }}
+    name: ${{ matrix.name }}${{ matrix.arch && format('-{0}', matrix.arch) || '' }} build${{ matrix.arch != 'arm64-v8a' && matrix.name != 'ios-sim' && matrix.name != 'ios' && matrix.name != 'apple-xcframework' && ' + test' || ''}}
     timeout-minutes: 20
     strategy:
       fail-fast: false
       matrix:
         include:
-          - os: macos-latest
-            name: isim
-            make: PLATFORM=isim
-          - os: macos-latest
-            name: ios
-            make: PLATFORM=ios
-          - os: ubuntu-latest
-            arch: arm64-v8a
-            name: android
-            make:
-              PLATFORM=android
-              CC=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android26-clang
-          - os: ubuntu-latest
-            arch: x86_64
-            name: android
-            make:
-              PLATFORM=android
-              CC=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android26-clang
-            sqlite-amalgamation-zip: https://sqlite.org/2025/sqlite-amalgamation-3490100.zip
-          - os: ubuntu-latest
+          - os: ubuntu-22.04
             arch: x86_64
             name: linux
-          - os: LinuxARM64
+          - os: ubuntu-22.04-arm
             arch: arm64
             name: linux
-          - os: macos-latest
+          - os: ubuntu-22.04
+            arch: x86_64
+            name: linux-musl
+            container: alpine:latest
+          - os: ubuntu-22.04-arm
+            arch: arm64
+            name: linux-musl
+          - os: macos-15
             name: macos
-          - os: windows-latest
+          - os: windows-2022
             arch: x86_64
             name: windows
+          - os: ubuntu-22.04
+            arch: arm64-v8a
+            name: android
+            make: PLATFORM=android ARCH=arm64-v8a
+          - os: ubuntu-22.04
+            arch: x86_64
+            name: android
+            make: PLATFORM=android ARCH=x86_64
+            sqlite-amalgamation-zip: https://sqlite.org/2025/sqlite-amalgamation-3490100.zip
+          - os: macos-15
+            name: ios
+            make: PLATFORM=ios
+          - os: macos-15
+            name: ios-sim
+            make: PLATFORM=ios-sim
+          - os: macos-15
+            name: apple-xcframework
+            make: xcframework
 
     defaults:
       run:
-        shell: bash
-    env:
-      MAKEFLAGS: -j 8
+        shell: ${{ matrix.container && 'sh' || 'bash' }}
 
     steps:
 
       - uses: actions/checkout@v4.2.2
 
-      - name: build sqlite-js
-        run: make ${{ matrix.make && matrix.make || ''}}
-
-      - name: windows install sqlite3
-        if: matrix.os == 'windows-latest'
+      - name: windows install dependencies
+        if: matrix.name == 'windows'
         run: choco install sqlite -y
 
-      - name: macos install sqlite3 without SQLITE_OMIT_LOAD_EXTENSION
+      - name: macos install dependencies
         if: matrix.name == 'macos'
         run: brew link sqlite --force
 
+      - name: linux-musl x86_64 install dependencies
+        if: matrix.name == 'linux-musl' && matrix.arch == 'x86_64'
+        run: apk update && apk add --no-cache gcc make sqlite musl-dev linux-headers
+
+      - name: linux-musl arm64 setup container
+        if: matrix.name == 'linux-musl' && matrix.arch == 'arm64'
+        run: |
+          docker run -d --name alpine \
+            --platform linux/arm64 \
+            -v ${{ github.workspace }}:/workspace \
+            -w /workspace \
+            alpine:latest \
+            tail -f /dev/null
+          docker exec alpine sh -c "apk update && apk add --no-cache gcc make sqlite musl-dev linux-headers"
+
+      - name: build sqlite-js
+        run: ${{ matrix.name == 'linux-musl' && matrix.arch == 'arm64' && 'docker exec alpine' || '' }} make extension ${{ matrix.make && matrix.make || ''}}
+
       - name: android setup test environment
         if: matrix.name == 'android' && matrix.arch != 'arm64-v8a'
         run: |
@@ -80,16 +100,16 @@ jobs:
           curl -O ${{ matrix.sqlite-amalgamation-zip }}
           unzip sqlite-amalgamation-*.zip
           export ${{ matrix.make }}
-          $CC sqlite-amalgamation-*/shell.c sqlite-amalgamation-*/sqlite3.c -o sqlite3 -ldl
+          $ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/${{ matrix.arch }}-linux-android26-clang sqlite-amalgamation-*/shell.c sqlite-amalgamation-*/sqlite3.c -o sqlite3 -ldl
           rm -rf sqlite-amalgamation-*.zip sqlite-amalgamation-*
           echo "::endgroup::"
 
           echo "::group::prepare the test script"
-          make test CC=$CC PLATFORM=$PLATFORM || echo "It should fail. Running remaining commands in the emulator"
+          make test PLATFORM=$PLATFORM ARCH=$ARCH || echo "It should fail. Running remaining commands in the emulator"
           cat > commands.sh << EOF
             mv -f /data/local/tmp/sqlite3 /system/xbin
             cd /data/local/tmp
-            $(make test CC=$CC PLATFORM=$PLATFORM -n)
+            $(make test PLATFORM=$PLATFORM ARCH=$ARCH -n)
           EOF
           echo "::endgroup::"
 
@@ -106,8 +126,8 @@ jobs:
             adb shell "sh /data/local/tmp/commands.sh"
 
       - name: test sqlite-js
-        if: matrix.name == 'linux' || matrix.name == 'macos' || matrix.name == 'windows'
-        run: make test
+        if: contains(matrix.name, 'linux') || matrix.name == 'windows' || matrix.name == 'macos'
+        run: ${{ matrix.name == 'linux-musl' && matrix.arch == 'arm64' && 'docker exec alpine' || '' }} make test ${{ matrix.make && matrix.make || ''}}
 
       - uses: actions/upload-artifact@v4.6.2
         with:
@@ -116,7 +136,7 @@ jobs:
           if-no-files-found: error
 
   release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: release
     needs: build
     if: github.ref == 'refs/heads/main'
@@ -154,8 +174,7 @@ jobs:
           for folder in "artifacts"/*; do
             if [ -d "$folder" ]; then
               name=$(basename "$folder")
-              zip -jq "${name}-${{ steps.tag.outputs.version }}.zip" "$folder"/*
-              tar -cJf "${name}-${{ steps.tag.outputs.version }}.tar.xz" -C "$folder" .
+              (cd "$folder" && zip -rq "../../${name}-${{ steps.tag.outputs.version }}.zip" .)
               tar -czf "${name}-${{ steps.tag.outputs.version }}.tar.gz" -C "$folder" .
             fi
           done
@@ -167,6 +186,5 @@ jobs:
           tag_name: ${{ steps.tag.outputs.version }}
           files: |
             js-*-${{ steps.tag.outputs.version }}.zip
-            js-*-${{ steps.tag.outputs.version }}.tar.xz
             js-*-${{ steps.tag.outputs.version }}.tar.gz
           make_latest: true
diff --git a/Makefile b/Makefile
@@ -3,16 +3,23 @@
 
 # Set default platform if not specified
 ifeq ($(OS),Windows_NT)
-    PLATFORM := windows
+	PLATFORM := windows
+	HOST := windows
+	CPUS := $(shell powershell -Command "[Environment]::ProcessorCount")
 else
-    UNAME_S := $(shell uname -s)
-    ifeq ($(UNAME_S),Darwin)
-        PLATFORM := macos
-    else
-        PLATFORM := linux
-    endif
+	HOST = $(shell uname -s | tr '[:upper:]' '[:lower:]')
+	ifeq ($(HOST),darwin)
+		PLATFORM := macos
+		CPUS := $(shell sysctl -n hw.ncpu)
+	else
+		PLATFORM := $(HOST)
+		CPUS := $(shell nproc)
+	endif
 endif
 
+# Speed up builds by using all available CPU cores
+MAKEFLAGS += -j$(CPUS)
+
 # Directories
 SRC_DIR := src
 LIB_DIR := libs
@@ -31,40 +38,50 @@ CFLAGS := -Wall -Wextra -fPIC -g -O2 -DQJS_BUILD_LIBC $(INCLUDES)
 
 # Platform-specific settings
 ifeq ($(PLATFORM),windows)
-    TARGET := $(DIST_DIR)/js.dll
-    LDFLAGS := -shared
-    # Create .def file for Windows
-    DEF_FILE := $(BUILD_DIR)/js.def
+	TARGET := $(DIST_DIR)/js.dll
+	LDFLAGS := -shared
+	# Create .def file for Windows
+	DEF_FILE := $(BUILD_DIR)/js.def
+	STRIP = strip --strip-unneeded $@
 else ifeq ($(PLATFORM),macos)
-    TARGET := $(DIST_DIR)/js.dylib
-    LDFLAGS := -arch x86_64 -arch arm64 -dynamiclib -undefined dynamic_lookup
-    # macOS-specific flags
-    CFLAGS += -arch x86_64 -arch arm64
+	TARGET := $(DIST_DIR)/js.dylib
+	LDFLAGS := -arch x86_64 -arch arm64 -dynamiclib -undefined dynamic_lookup
+	# macOS-specific flags
+	CFLAGS += -arch x86_64 -arch arm64
+	STRIP = strip -x -S $@
 else ifeq ($(PLATFORM),android)
-    # Use Android NDK's Clang compiler, the user should set the CC
-    # example CC=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android26-clang
-    ifeq ($(filter %-clang,$(CC)),)
-        $(error "CC must be set to the Android NDK's Clang compiler")
-    endif
-    TARGET := $(DIST_DIR)/js.so
-    LDFLAGS := -shared -lm
-    # Android-specific flags
-    CFLAGS += -D__ANDROID__
+	ifndef ARCH # Set ARCH to find Android NDK's Clang compiler, the user should set the ARCH
+		$(error "Android ARCH must be set to ARCH=x86_64 or ARCH=arm64-v8a")
+	endif
+	ifndef ANDROID_NDK # Set ANDROID_NDK path to find android build tools; e.g. on MacOS: export ANDROID_NDK=/Users/username/Library/Android/sdk/ndk/25.2.9519653
+		$(error "Android NDK must be set")
+	endif
+	BIN = $(ANDROID_NDK)/toolchains/llvm/prebuilt/$(HOST)-x86_64/bin
+	ifneq (,$(filter $(ARCH),arm64 arm64-v8a))
+		override ARCH := aarch64
+	endif
+	CC = $(BIN)/$(ARCH)-linux-android26-clang
+	TARGET := $(DIST_DIR)/js.so
+	LDFLAGS := -lm -shared
+	STRIP = $(BIN)/llvm-strip --strip-unneeded $@
 else ifeq ($(PLATFORM),ios)
-    TARGET := $(DIST_DIR)/js.dylib
-    SDK := -isysroot $(shell xcrun --sdk iphoneos --show-sdk-path) -miphoneos-version-min=11.0
-    LDFLAGS := -dynamiclib $(SDK)
-    # iOS-specific flags
-    CFLAGS += -arch arm64 $(SDK)
-else ifeq ($(PLATFORM),isim)
-    TARGET := $(DIST_DIR)/js.dylib
-    SDK := -isysroot $(shell xcrun --sdk iphonesimulator --show-sdk-path) -miphonesimulator-version-min=11.0
-    LDFLAGS := -arch x86_64 -arch arm64 -dynamiclib $(SDK)
-    # iphonesimulator-specific flags
-    CFLAGS += -arch x86_64 -arch arm64 $(SDK)
+	TARGET := $(DIST_DIR)/js.dylib
+	SDK := -isysroot $(shell xcrun --sdk iphoneos --show-sdk-path) -miphoneos-version-min=11.0
+	LDFLAGS := -dynamiclib $(SDK)
+	# iOS-specific flags
+	CFLAGS += -arch arm64 $(SDK)
+	STRIP = strip -x -S $@
+else ifeq ($(PLATFORM),ios-sim)
+	TARGET := $(DIST_DIR)/js.dylib
+	SDK := -isysroot $(shell xcrun --sdk iphonesimulator --show-sdk-path) -miphonesimulator-version-min=11.0
+	LDFLAGS := -arch x86_64 -arch arm64 -dynamiclib $(SDK)
+	# iphonesimulator-specific flags
+	CFLAGS += -arch x86_64 -arch arm64 $(SDK)
+	STRIP = strip -x -S $@
 else # linux
-    TARGET := $(DIST_DIR)/js.so
-    LDFLAGS := -lm -shared
+	TARGET := $(DIST_DIR)/js.so
+	LDFLAGS := -lm -shared
+	STRIP = strip --strip-unneeded $@
 endif
 
 # Object files
@@ -83,6 +100,8 @@ ifeq ($(PLATFORM),windows)
 	# Generate import library for Windows
 	dlltool -D $@ -d $(DEF_FILE) -l $(DIST_DIR)/js.lib
 endif
+	# Strip debug symbols
+	$(STRIP)
 
 # Compile source files
 $(BUILD_DIR)/%.o: $(SRC_DIR)/%.c
@@ -138,25 +157,76 @@ test: $(TARGET) $(TEST_TARGET)
 	sqlite3 ":memory:" -cmd ".bail on" ".load ./$<" "SELECT js_eval('console.log(\"hello, world\nToday is\", new Date().toLocaleDateString())');"
 	./$(TEST_TARGET)
 
+.NOTPARALLEL: %.dylib
+%.dylib:
+	rm -rf $(BUILD_DIR) && $(MAKE) PLATFORM=$*
+	mv $(DIST_DIR)/js.dylib $(DIST_DIR)/$@
+
+define PLIST
+<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
+<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\
+<plist version=\"1.0\">\
+<dict>\
+<key>CFBundleDevelopmentRegion</key>\
+<string>en</string>\
+<key>CFBundleExecutable</key>\
+<string>js</string>\
+<key>CFBundleIdentifier</key>\
+<string>ai.sqlite.js</string>\
+<key>CFBundleInfoDictionaryVersion</key>\
+<string>6.0</string>\
+<key>CFBundlePackageType</key>\
+<string>FMWK</string>\
+<key>CFBundleSignature</key>\
+<string>????</string>\
+<key>CFBundleVersion</key>\
+<string>$(shell make version)</string>\
+<key>CFBundleShortVersionString</key>\
+<string>$(shell make version)</string>\
+<key>MinimumOSVersion</key>\
+<string>11.0</string>\
+</dict>\
+</plist>
+endef
+
+LIB_NAMES = ios.dylib ios-sim.dylib macos.dylib
+FMWK_NAMES = ios-arm64 ios-arm64_x86_64-simulator macos-arm64_x86_64
+$(DIST_DIR)/%.xcframework: $(LIB_NAMES)
+	@$(foreach i,1 2 3,\
+		lib=$(word $(i),$(LIB_NAMES)); \
+		fmwk=$(word $(i),$(FMWK_NAMES)); \
+		mkdir -p $(DIST_DIR)/$$fmwk/js.framework; \
+		printf "$(PLIST)" > $(DIST_DIR)/$$fmwk/js.framework/Info.plist; \
+		mv $(DIST_DIR)/$$lib $(DIST_DIR)/$$fmwk/js.framework/js; \
+		install_name_tool -id "@rpath/js.framework/js" $(DIST_DIR)/$$fmwk/js.framework/js; \
+	)
+	xcodebuild -create-xcframework $(foreach fmwk,$(FMWK_NAMES),-framework $(DIST_DIR)/$(fmwk)/js.framework) -output $@
+	rm -rf $(foreach fmwk,$(FMWK_NAMES),$(DIST_DIR)/$(fmwk))
+
+xcframework: $(DIST_DIR)/js.xcframework
+
+version:
+	@echo $(shell sed -n 's/^#define SQLITE_JS_VERSION[[:space:]]*"\([^"]*\)".*/\1/p' src/sqlitejs.h)
+
 # Help message
 help:
 	@echo "SQLite JavaScript Extension Makefile"
 	@echo "Usage:"
-	@echo "  make [PLATFORM=platform] [target]"
+	@echo "  make  [PLATFORM=platform] [ARCH=arch] [ANDROID_NDK=\$$ANDROID_HOME/ndk/26.1.10909125] [target]"
 	@echo ""
 	@echo "Platforms:"
 	@echo "  linux (default on Linux)"
 	@echo "  macos (default on macOS)"
 	@echo "  windows (default on Windows)"
-	@echo "  android (needs CC to be set to Android NDK's Clang compiler)"
+	@echo "  android (needs ARCH to be set to x86_64 or arm64-v8a and ANDROID_NDK to be set)"
 	@echo "  ios (only on macOS)"
-	@echo "  isim (only on macOS)"
+	@echo "  ios-sim (only on macOS)"
 	@echo ""
 	@echo "Targets:"
-	@echo "  all       - Build the extension (default)"
-	@echo "  clean     - Remove built files"
-	@echo "  install   - Install the extension"
-	@echo "  test      - Test the extension"
-	@echo "  help      - Display this help message"
+	@echo "  all		- Build the extension (default)"
+	@echo "  clean		- Remove built files"
+	@echo "  install	- Install the extension"
+	@echo "  test		- Test the extension"
+	@echo "  help		- Display this help message"
 
-.PHONY: all clean install test help
+.PHONY: all clean install test help version xcframework
