save

Author: jcbhmr

.devcontainer/Taskfile

@@ -4,6 +4,15 @@ set -Eeuo pipefail
 updateContentCommand() {
     curl -sS https://webi.sh/zig | sh
     source ~/.config/envman/PATH.env
+
+    pushd ~
+    git clone https://github.com/emscripten-core/emsdk.git
+    cd emsdk
+    ./emsdk install latest
+    ./emsdk activate latest
+    echo 'source ~/emsdk/emsdk_env.sh' >> ~/.bashrc
+    source ./emsdk_env.sh
+    popd
 }
 
 "$@"

.github/workflows/cmake-workflow-preset-build.yml

@@ -76,13 +76,22 @@ jobs:
         with:
           key: ${{ runner.os }}-${{ hashFiles("**") }}
           path: build/${{ matrix.target }}
-      - run: cmake --workflow --preset "build-$TARGET"
+      - run: cmake --workflow --preset "build:$TARGET"
         env:
           TARGET: ${{ matrix.target }}
-      - run: cpack --preset "build-$TARGET"
+      - run: cmake --workflow --preset "package:$TARGET"
+        env:
+          TARGET: ${{ matrix.target }}
+      - run: |
+          file=$(echo build/"$TARGET"/quickjs-ng-"$TARGET".*)
+          if [[ $file =~ .zip$ ]]; then
+            unzip "$file" -d "build/$TARGET"
+          else
+            tar -xzf "$file" -C "build/$TARGET"
+          fi
         env:
           TARGET: ${{ matrix.target }}
       - uses: actions/upload-artifact@v4
         with:
           name: quickjs-${{ matrix.target }}
-          path: stage/${{ matrix.target }}
+          path: build/${{ matrix.target }}/quickjs-ng-${{ matrix.target }}

.github/workflows/cmake-workflow-preset-test.yml

@@ -73,6 +73,9 @@ jobs:
         with:
           key: ${{ runner.os }}-${{ hashFiles("**") }}
           path: build/${{ matrix.target }}
-      - run: cmake --workflow --preset "test-$TARGET"
+      - run: cmake --workflow --preset "build:$TARGET"
+        env:
+          TARGET: ${{ matrix.target }}
+      - run: cmake --workflow --preset "test:$TARGET"
         env:
           TARGET: ${{ matrix.target }}

CMakeLists.txt

@@ -1,6 +1,11 @@
-cmake_minimum_required(VERSION 3.9)
+cmake_minimum_required(VERSION 3.29)
 
-project(quickjs LANGUAGES C)
+project(quickjs
+    VERSION 0.5.0
+    DESCRIPTION "⚡ The small quick embeddable JavaScript runtime"
+    HOMEPAGE_URL "https://quickjs-ng.github.io/quickjs-ng/"
+    LANGUAGES C
+)
 
 include(CheckCCompilerFlag)
 include(GNUInstallDirs)
@@ -10,6 +15,7 @@ set(CMAKE_C_STANDARD_REQUIRED ON)
 set(CMAKE_C_EXTENSIONS ON)
 set(CMAKE_C_STANDARD 11)
 
+# If left unset this would be a toolchain-specific default.
 if(NOT CMAKE_BUILD_TYPE)
     message(STATUS "No build type selected, default to Release")
     set(CMAKE_BUILD_TYPE "Release")
@@ -364,3 +370,11 @@ if(NOT IOS)
     install(FILES LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR})
     install(DIRECTORY examples DESTINATION ${CMAKE_INSTALL_DOCDIR})
 endif()
+
+# CPack
+if(WIN32)
+    set(CPACK_GENERATOR "ZIP")
+else()
+    set(CPACK_GENERATOR "TGZ")
+endif()
+include(CPack)

CMakePresets.json

@@ -13,28 +13,72 @@
       "cacheVariables": {
         "ZIG_TARGET": "x86_64-linux-musl"
       }
+    },
+    {
+      "name": "wasm32-emscripten",
+      "binaryDir": "build/wasm32-emscripten",
+      "toolchainFile": "$env{EMSDK}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake",
+      "cacheVariables": {
+        "CMAKE_CROSSCOMPILING_EMULATOR": "node"
+      }
     }
   ],
   "buildPresets": [
     {
       "name": "x86_64-linux-musl",
       "configurePreset": "x86_64-linux-musl"
+    },
+    {
+      "name": "wasm32-emscripten",
+      "configurePreset": "wasm32-emscripten"
     }
   ],
   "packagePresets": [
     {
       "name": "x86_64-linux-musl",
       "configurePreset": "x86_64-linux-musl",
-      "generators": ["TGZ"]
+      "variables": {
+        "CPACK_PACKAGE_FILE_NAME": "quickjs-ng-x86_64-linux-musl"
+      }
+    },
+    {
+      "name": "wasm32-emscripten",
+      "configurePreset": "wasm32-emscripten",
+      "variables": {
+        "CPACK_PACKAGE_FILE_NAME": "quickjs-ng-wasm32-emscripten"
+      }
     }
   ],
   "workflowPresets": [
     {
-      "name": "build-x86_64-linux-musl",
+      "name": "build:x86_64-linux-musl",
       "steps": [
         { "type": "configure", "name": "x86_64-linux-musl" },
         { "type": "build", "name": "x86_64-linux-musl" }
       ]
+    },
+    {
+      "name": "package:x86_64-linux-musl",
+      "steps": [
+        { "type": "configure", "name": "x86_64-linux-musl" },
+        { "type": "build", "name": "x86_64-linux-musl" },
+        { "type": "package", "name": "x86_64-linux-musl" }
+      ]
+    },
+    {
+      "name": "build:wasm32-emscripten",
+      "steps": [
+        { "type": "configure", "name": "wasm32-emscripten" },
+        { "type": "build", "name": "wasm32-emscripten" }
+      ]
+    },
+    {
+      "name": "package:wasm32-emscripten",
+      "steps": [
+        { "type": "configure", "name": "wasm32-emscripten" },
+        { "type": "build", "name": "wasm32-emscripten" },
+        { "type": "package", "name": "wasm32-emscripten" }
+      ]
     }
   ]
 }