switch to lz4 and preload non pic sdl2

Author: pmp-p

.github/workflows/ci.yml

@@ -38,10 +38,12 @@ jobs:
       run: |
         sudo apt-get update --fix-missing
         # git clang libffi-dev libssl-dev zlib1g-dev libncursesw5-dev python3-pip make
-        sudo apt-get install -y bash wget
+        sudo apt-get install -y bash wget lz4
 
     - name: Build sdk
-      run: bash ./python-wasm-sdk.sh
+      run: |
+        chmod +x ./python-wasm-sdk.sh
+        bash -c "CIVER=ubuntu-22.04 ./python-wasm-sdk.sh"
 
     - name: Upload sdk to Github artifacts
       uses: actions/upload-artifact@v2

README.md

@@ -5,34 +5,64 @@ Tooling for building CPython+Pygame on WebAssembly
 example building from within own pygame git clone tree on ubuntu 20.04 or linux mint :
 ```bash
 #!/bin/bash
+# update system
+sudo apt-get update
+sudo apt-get install -y git bash python3-pip curl lz4 pv
+sudo mkdir -p /opt/python-wasm-sdk && sudo chown $(whoami) /opt/python-wasm-sdk
+
 
 # in github CI, current working dir would be /home/runner/pygame/pygame.
+[ -d ../pygame ] || git clone https://github.com/pygame/pygame
+if [ -f setup.py ]
+then
 
-# update system
-sudo apt-get update
-sudo apt-get install -y bash python3-pip curl pv
+    # update cython
+    if [ -f ../dev ]
+    then
+        echo "  * not upgrading cython"
+    else
+        pip3 install git+https://github.com/cython/cython.git --user --upgrade
+    fi
 
-# update cython
-pip3 install git+https://github.com/cython/cython.git --upgrade
+    # update source tree
+    git clean -f
+    git pull
 
-# update source tree
-git clean -f
-git pull
+    mkdir -p /opt/python-wasm-sdk
 
-# sdk
-sudo mkdir -p /opt/python-wasm-sdk && sudo chown $(whoami) /opt/python-wasm-sdk
-curl -sL --retry 5 https://github.com/pygame-web/python-wasm-sdk/releases/download/0.1.0/python-wasm-sdk-stable.tar.bz2 \
- | tar xvPj \
- | pv -f -c -p -l -s 20626 >/dev/null
+    # sdk
+    if [ -f /opt/python-wasm-sdk/python3-wasm ]
+    then
+        echo "  * not upgrading python-wasm-sdk"
+    else
+        echo "  * using cached python-wasm-sdk archive"
+
+        if [ -f ../python-wasm-sdk-stable.tar.lz4 ]
+        then
+#            time tar xfvjP ../python-wasm-sdk-stable.tar.bz2 \
+#             | pv -f -c -p -l -s 20626 >/dev/null
+            time tar xfvP ../python-wasm-sdk-stable.tar.lz4 --use-compress-program=lz4 \
+             | pv -f -c -p -l -s 20626 >/dev/null
+        else
+            curl -sL --retry 5 https://github.com/pygame-web/python-wasm-sdk/releases/download/0.2.0/python-wasm-sdk-stable.tar.bz2 \
+             | tar xvPj \
+             | pv -f -c -p -l -s 20626 >/dev/null
+        fi
+    fi
+
+    # build pygame
+    touch $(find |grep pxd$)
+    python3 setup.py config cython >/dev/null
+
+    /opt/python-wasm-sdk/python3-wasm setup.py -config -auto -sdl2 >/dev/null
 
-# build pygame
-touch $(find |grep pxd$)
-python3 setup.py config cython
+    # /opt/python-wasm-sdk/python3-wasm setup.py build
+    EMCC_CFLAGS="-fPIC -I/opt/python-wasm-sdk/devices/emsdk/usr/include/SDL2 -s USE_SDL=2" /opt/python-wasm-sdk/python3-wasm setup.py build -j1
 
-/opt/python-wasm-sdk/python3-wasm setup.py -config -auto -sdl2
 
-/opt/python-wasm-sdk/python3-wasm setup.py build
+    mkdir -p dist
+    # get static lib
+    SYS_PYTHON=python3 /opt/python-wasm-sdk/emsdk/upstream/emscripten/emar rcs dist/libpygame.a $(find build/temp.wasm32-*/|grep o$)
 
-# get static lib
-SYS_PYTHON=python3 /opt/python-wasm-sdk/emsdk/upstream/emscripten/emar rcs libpygame.a $(find build/temp.wasm32-*/|grep o$)
+fi
 ```

python-wasm-sdk.sh

@@ -36,9 +36,9 @@ then
         then
             echo "making tarball"
             cd /
-            rm -rf ${SDKDIR}/emsdk/upstream/emscripten/cache/ports*
+
             mkdir -p /tmp/sdk
-            tar -cpPRj \
+            tar -cpPR \
                 ${SDKDIR}/config \
                 ${SDKDIR}/build/pycache/.??* \
                 ${SDKDIR}/build/pycache/sysconfig/_sysconfigdata__emscripten_debug.py \
@@ -47,7 +47,10 @@ then
                 ${SDKDIR}/emsdk \
                 ${SDKDIR}/devices/* \
                 ${SDKDIR}/prebuilt/* \
-                > /tmp/sdk/python-wasm-sdk-stable.tar.bz2
+                > /tmp/sdk/python-wasm-sdk-stable.tar
+                lz4 /tmp/sdk/python-wasm-sdk-${$CIVER:-ubuntu-latest}.tar
+                # bzip2 will remove original
+                bzip2 /tmp/sdk/python-wasm-sdk-${$CIVER:-ubuntu-latest}.tar
         else
             echo " cpython-build-emsdk-deps failed"
             exit 2

scripts/emsdk-fetch.sh

@@ -80,6 +80,21 @@ then
             #embuilder build $one
         done
 
+        if $CI
+        then
+            echo "
+
+        ==========================================================
+                            stripping emsdk
+        ==========================================================
+"
+            rm -rf ${SDKDIR}/emsdk/upstream/emscripten/cache/ports*
+            # something triggers sdl2 *full* rebuild in pygame.
+            # but only that one.
+            embuilder --pic build sdl2
+            embuilder --pic sdl2
+            rm -rf ${SDKDIR}/emsdk/upstream/emscripten/tests
+        fi
 
 # -Wno-limited-postlink-optimizations