Add debug builds (#11)

tiran · Aug 8, 2022 · 57a5782 · 57a5782
1 parent 827425b
commit 57a5782
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 6 deletions.
diff --git a/.github/actions/build_emscripten/action.yml b/.github/actions/build_emscripten/action.yml
@@ -12,7 +12,9 @@ inputs:
     type: choice
     options:
       - browser
+      - browser-debug
       - node-dl
+      - node-dl-debug
       - node-pthreads
   configure_args:
     required: false
@@ -45,6 +47,23 @@ runs:
               --disable-wasm-pthreads \
               ${{ inputs.configure_args }}
       if: "${{ inputs.flavor == 'browser' }}"
+    - name: configure "host" Python for browser-debug
+      shell: bash
+      working-directory: "${{ env.HOST_PYTHON_DIR }}"
+      run: |
+        set -ex
+        . $EMSDK_DIR/emsdk_env.sh
+        export EM_COMPILER_WRAPPER=ccache
+        CONFIG_SITE=${CPYTHON_DIR}/Tools/wasm/config.site-wasm32-emscripten \
+            emconfigure ${CPYTHON_DIR}/configure -C \
+              --build=$(${CPYTHON_DIR}/config.guess) \
+              --host=wasm32-unknown-emscripten \
+              --with-build-python=${BUILD_PYTHON_DIR}/python \
+              --with-emscripten-target=browser-debug \
+              --enable-wasm-dynamic-linking \
+              --disable-wasm-pthreads \
+              ${{ inputs.configure_args }}
+      if: "${{ inputs.flavor == 'browser-debug' }}"
     - name: configure "host" Python for node-dl
       shell: bash
       working-directory: "${{ env.HOST_PYTHON_DIR }}"
@@ -62,6 +81,23 @@ runs:
               --disable-wasm-pthreads \
               ${{ inputs.configure_args }}
       if: "${{ inputs.flavor == 'node-dl' }}"
+    - name: configure "host" Python for node-dl-debug
+      shell: bash
+      working-directory: "${{ env.HOST_PYTHON_DIR }}"
+      run: |
+        set -ex
+        . $EMSDK_DIR/emsdk_env.sh
+        export EM_COMPILER_WRAPPER=ccache
+        CONFIG_SITE=${CPYTHON_DIR}/Tools/wasm/config.site-wasm32-emscripten \
+            emconfigure ${CPYTHON_DIR}/configure -C \
+              --build=$(${CPYTHON_DIR}/config.guess) \
+              --host=wasm32-unknown-emscripten \
+              --with-build-python=${BUILD_PYTHON_DIR}/python \
+              --with-emscripten-target=node-debug \
+              --enable-wasm-dynamic-linking \
+              --disable-wasm-pthreads \
+              ${{ inputs.configure_args }}
+      if: "${{ inputs.flavor == 'node-dl-debug' }}"
     - name: configure "host" Python for node-pthreads
       shell: bash
       working-directory: "${{ env.HOST_PYTHON_DIR }}"

diff --git a/.github/actions/package_emscripten/action.yml b/.github/actions/package_emscripten/action.yml
@@ -12,7 +12,9 @@ inputs:
     type: choice
     options:
       - browser
+      - browser-debug
       - node-dl
+      - node-dl-debug
       - node-pthreads
 runs:
   using: "composite"

diff --git a/.github/workflows/emsdk.yml b/.github/workflows/emsdk.yml
@@ -29,9 +29,11 @@ jobs:
           - "3.11"
           - "main"
         flavor:
+          - browser
+          - browser-debug
           - node-dl
+          - node-dl-debug
           - node-pthreads
-          - browser
     steps:
       - uses: actions/checkout@v2
       - name: "Clone and build 'build' Python ${{ matrix.python_version }}"
@@ -58,15 +60,15 @@ jobs:
           set -e
           . $EMSDK_DIR/emsdk_env.sh
           make pythoninfo
-        if: "${{ matrix.flavor != 'browser' }}"
+        if: ${{ matrix.flavor == 'node-dl' || matrix.flavor == 'node-dl-debug' || matrix.flavor == 'node-pthreads' }}
       - name: Run tests
         shell: bash
         working-directory: "${{ env.HOST_PYTHON_DIR }}"
         run: |
           set -e
           . $EMSDK_DIR/emsdk_env.sh
           make buildbottest TESTOPTS="-j2"
-        if: ${{ matrix.flavor != 'browser' }}
+        if: ${{ matrix.flavor == 'node-dl' || matrix.flavor == 'node-pthreads' }}
       - name: "Package ${{ matrix.python_version }} ${{ matrix.flavor }}"
         uses: ./.github/actions/package_emscripten
         id: package

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -66,6 +66,8 @@ jobs:
 
             The files must be served from a web server. You can use the `./wasm_webserver.py` script to run a local web server and access the browser REPL from http://localhost:8000/python.html
 
+            The `*browser-debug.zip` is a debug build with additional debug symbols and fewer optimizations.
+
             ## `Python-${{ env.PYTHON_TAG }}-wasm32-emscripten-${{ inputs.emsdk_version }}-node-dl.zip`
 
             Python on NodeJS (dynamic linking enabled).
@@ -82,6 +84,8 @@ jobs:
             node --experimental-wasm-bigint python.js
             ```
 
+            The `*node-dl-debug.zip` is a debug build with additional debug symbols and fewer optimizations.
+
             ## `Python-${{ env.PYTHON_TAG }}-wasm32-emscripten-${{ inputs.emsdk_version }}-node-pthreads.zip`
 
             Python on NodeJS (pthread emulation enabled).
@@ -179,9 +183,11 @@ jobs:
       fail-fast: false
       matrix:
         flavor:
+          - browser
+          - browser-debug
           - node-dl
+          - node-dl-debug
           - node-pthreads
-          - browser
     steps:
       - uses: actions/checkout@v2
       - name: "Clone and build 'build' Python ${{ inputs.python_tag }}"
@@ -208,15 +214,15 @@ jobs:
           set -e
           . $EMSDK_DIR/emsdk_env.sh
           make pythoninfo
-        if: "${{ matrix.flavor != 'browser' }}"
+        if: ${{ matrix.flavor == 'node-dl' || matrix.flavor == 'node-dl-debug' || matrix.flavor == 'node-pthreads' }}
       - name: Run tests
         shell: bash
         working-directory: "${{ env.HOST_PYTHON_DIR }}"
         run: |
           set -e
           . $EMSDK_DIR/emsdk_env.sh
           make buildbottest TESTOPTS="-j2"
-        if: ${{ matrix.flavor != 'browser' }}
+        if: ${{ matrix.flavor == 'node-dl' || matrix.flavor == 'node-pthreads' }}
       - name: "Package ${{ inputs.python_tag }} ${{ matrix.flavor }}"
         uses: ./.github/actions/package_emscripten
         id: package

diff --git a/README.md b/README.md
@@ -20,6 +20,9 @@ The `emsdk-tot-upstream` builds are using Emscripte tip-of-tree (nightlies).
 ### Emscripten browser target
 
 - `Python-3.11dev-wasm32-emscripten-3.1.18-browser`: Python 3.11 branch, Emscripten SDK 3.1.18
+- `Python-3.11dev-wasm32-emscripten-3.1.18-browser-debug`: Python 3.11 branch,
+  Emscripten SDK 3.1.18, debug build with additional symbols and fewer
+  optimizations
 - `Python-3.11dev-wasm32-emscripten-3.1.18-browser`: Python main branch (3.12), Emscripten SDK 3.1.18
 
 The files must be served from a web server. You can use the
@@ -30,6 +33,9 @@ access the browser REPL from http://localhost:8000/python.html
 
 - `Python-3.11dev-wasm32-emscripten-3.1.18-node-dl`: WASM dynamic linking, Python
   3.11 branch, Emscripten SDK 3.1.18
+- `Python-3.11dev-wasm32-emscripten-3.1.18-node-dl-debug`: WASM dynamic linking, Python
+  3.11 branch, Emscripten SDK 3.1.18, debug build with additional debug symbols and fewer
+  optimizations
 - `Python-3.12dev-wasm32-emscripten-3.1.18-node-dl`: WASM dynamic linking, Python
   main branch (3.12), Emscripten SDK 3.1.18
 - `Python-3.11dev-wasm32-emscripten-3.1.18-node-pthreads`: WASM pthreads emulation,