3.1.72pre

Author: pmp-p

.github/workflows/ci.yml

@@ -19,7 +19,13 @@ jobs:
     runs-on: ubuntu-22.04
     env:
        BUILDS: 3.12 3.13
-       EMFLAVOUR: tot
+       EMFLAVOUR: latest
+       Py_GIL_DISABLED: false
+       wasisdk: true
+       gosdk: false
+       rustsdk: false
+       nimsdk: false
+
 
     steps:
     - uses: actions/[email protected]

config

@@ -85,8 +85,10 @@ export WASMTIME_HOME=$WASISDK
 
 # stable
 NIM_VERSION=nim-2.0.8
-NIM_URL=https://nim-lang.org/download/${NIM_VERSION}-linux_x64.tar.xz
 
+# testing
+NIM_VERSION=nim-2.2.0
+NIM_URL=https://nim-lang.org/download/${NIM_VERSION}-linux_x64.tar.xz
 
 NIM_VERSION=nim-git
 NIM_URL=https://github.com/nim-lang/Nim
@@ -96,6 +98,12 @@ export NIMSDK=${NIMSDK:-"${SDKROOT}/nimsdk"}
 
 # EXTRABINS="$EXTRABINS $NIMSDK/bin"
 
+# =============== rust ====================
+export CARGO_HOME=${CARGO_HOME:-${SDKROOT}}/rust
+export RUSTUP_HOME=${RUSTUP_HOME:-${SDKROOT}}/rust
+mkdir -p ${CARGO_HOME}/bin
+EXTRABINS="$EXTRABINS $CARGO_HOME/bin"
+
 # ================ go =====================
 export GOPRIVATE=*
 export GONOPROXY=*
@@ -122,6 +130,11 @@ EXTRABINS="$EXTRABINS $BUN_INSTALL/bin"
 AOSP_NDK=25.2.9519653
 
 
+# ===========     panda3d =================
+
+export PANDA_PRC_DIR=${SDKROOT}/support
+
+
 PATH=/usr/bin:/bin
 for extrabin in $EXTRABINS
 do
@@ -138,19 +151,18 @@ done
 
 
 # this is python used for emsdk : ${SYS_PYTHON} -> ${EMSDK_PYTHON}
+# sane default
+export SYS_PYTHON=$(command -v python${PYMAJOR})
 for py in 10 9 8
 do
     if command -v python${PYMAJOR}.${py} >/dev/null
     then
         export SYS_PYTHON=$(command -v python${PYMAJOR}.${py})
         break
-    else
-        # sane default
-        export SYS_PYTHON=$(command -v python${PYMAJOR})
     fi
 done
 
-export GITGET="git clone --recursive --no-tags --depth 1 --single-branch --branch"
+export CLONE="git clone --recursive --no-tags --depth 1 --single-branch --branch"
 export LD_LIBRARY_PATH="${HOST_PREFIX}/lib:$LD_LIBRARY_PATH"
 export PATH="${HOST_PREFIX}/bin:$PATH"
 fi

emsdk-cc

@@ -139,7 +139,7 @@ COMPILE = False
 USE_RAWFS = True
 CMAKE = False
 RUSTC = False
-
+NINJA = env("NINJA", false)
 
 out = []
 
@@ -259,13 +259,16 @@ for argc, arg in enumerate(sys.argv):
             continue
 
     # duplicates can happen on cmake/rustc but they are expected to be here for a reason so skip them
-    if not (CMAKE or RUSTC):
+    if not (CMAKE or NINJA or RUSTC):
         # prevent duplicates objects/archives files on cmdline when linking
         if LINKING or MODE == "-o":
             if arg.endswith(".a") or arg.endswith(".o"):
                 if arg in out:
                     continue
 
+    # fix sysroot is not default to PIC
+    arg = arg.replace("/lib/wasm32-emscripten/lib","/lib/wasm32-emscripten/pic/lib")
+
     out.append(arg)
 
 os.environ.pop("_EMCC_CCACHE", "")

python-wasi-sdk.sh

@@ -4,15 +4,38 @@ reset
 # TODO: check how dbg tools work with default settings
 # https://developer.chrome.com/blog/wasm-debugging-2020/
 
+if command -v python3
+then
+    SYS_PYTHON=$(command -v python3)
+else
+    SYS_PYTHON=$(command -v python)
+fi
+
+DISTRIB_RELEASE="any"
+
+# is it linux enough ?
+if [ -f /etc/lsb-release ]
+then
+    . /etc/lsb-release
+    export PLATFORM=linux
+else
+    # or not
+    export DISTRIB_ID=$($SYS_PYTHON -E -c "print(__import__('sys').platform)")
+    echo no /etc/lsb-release found, please identify platform '$DISTRIB_ID'
+    DISTRIB="${DISTRIB_ID}-${DISTRIB_RELEASE}"
+    exit 1
+fi
+
+export DISTRIB="${DISTRIB_ID}-${DISTRIB_RELEASE}"
 
-. /etc/lsb-release
-DISTRIB="${DISTRIB_ID}-${DISTRIB_RELEASE}"
+export SDKROOT=${SDKROOT:-/tmp/sdk}
 
-SDKROOT=${SDKROOT:-/opt/python-wasm-sdk}
+# default is behave like a CI
+export CI={CI:-true}
 
-export SDKROOT
+# maybe have ci flavours later
 export CIVER=${CIVER:-$DISTRIB}
-export CI=true
+
 
 if echo $0|grep -q python-wasm-sdk\.sh
 then
@@ -24,19 +47,18 @@ else
     emsdk=false
     BUILDS=3.13
     wasisdk=true
-    nimsdk=true
-fi
-
-if $wasisdk
-then
-    echo " * adding wasi-sdk to wasm-sdk"
-fi
-
-if $nimsdk
-then
-    echo " * adding nim-sdk to wasm-sdk"
+    gosdk=${gosdk:-false}
+    rustsdk=${rustdsk:-false}
+    nimsdk=${nimsdk:-false}
 fi
 
+for lang in wasisdk gosdk rustsdk nimsdk
+do
+    if ${!lang:-false}
+    then
+        echo " * adding ${lang} to wasm-sdk"
+    fi
+done
 
 if [ -d ${SDKROOT} ]
 then
@@ -148,8 +170,11 @@ END
         then
             echo "keeping installed wasmtime and wasi binaries"
         else
-            #wget https://github.com/bytecodealliance/wasmtime/releases/download/v22.0.0/wasmtime-v22.0.0-x86_64-linux.tar.xz \
-            wget https://github.com/bytecodealliance/wasmtime/releases/download/v23.0.2/wasmtime-v23.0.2-$(arch)-linux.tar.xz \
+            #wget https://github.com/bytecodealliance/wasmtime/releases/download/v22.0.0/wasmtime-v22.0.0-x86_64-linux.tar.xz
+
+# TODO: window only has a zip archive, better use wasmtime-py instead.
+
+            wget https://github.com/bytecodealliance/wasmtime/releases/download/v26.0.1/wasmtime-v26.0.1-$(arch)-$(PLATFORM).tar.xz \
              -O-|xzcat|tar xfv -
             mv -vf $(find wasmtime*|grep /wasmtime$) ${SDKROOT}/devices/$(arch)/usr/bin
         fi
@@ -290,7 +315,7 @@ END
 
         if $nimsdk
         then
-            ${SDKROOT}/python-nim-sdk.sh
+            ${SDKROOT}/lang/nimsdk.sh
         fi
 
         mkdir -p /tmp/sdk

python-wasm-sdk.sh

@@ -4,15 +4,38 @@ reset
 # TODO: check how dbg tools work with default settings
 # https://developer.chrome.com/blog/wasm-debugging-2020/
 
+if command -v python3
+then
+    SYS_PYTHON=$(command -v python3)
+else
+    SYS_PYTHON=$(command -v python)
+fi
+
+DISTRIB_RELEASE="any"
+
+# is it linux enough ?
+if [ -f /etc/lsb-release ]
+then
+    . /etc/lsb-release
+    export PLATFORM=linux
+else
+    # or not
+    export DISTRIB_ID=$($SYS_PYTHON -E -c "print(__import__('sys').platform)")
+    echo no /etc/lsb-release found, please identify platform '$DISTRIB_ID'
+    DISTRIB="${DISTRIB_ID}-${DISTRIB_RELEASE}"
+    exit 1
+fi
+
+export DISTRIB="${DISTRIB_ID}-${DISTRIB_RELEASE}"
 
-. /etc/lsb-release
-DISTRIB="${DISTRIB_ID}-${DISTRIB_RELEASE}"
+export SDKROOT=${SDKROOT:-/tmp/sdk}
 
-SDKROOT=${SDKROOT:-/opt/python-wasm-sdk}
+# default is behave like a CI
+export CI={CI:-true}
 
-export SDKROOT
+# maybe have ci flavours later
 export CIVER=${CIVER:-$DISTRIB}
-export CI=true
+
 
 if echo $0|grep -q python-wasm-sdk\.sh
 then
@@ -24,19 +47,18 @@ else
     emsdk=false
     BUILDS=3.13
     wasisdk=true
-    nimsdk=true
-fi
-
-if $wasisdk
-then
-    echo " * adding wasi-sdk to wasm-sdk"
-fi
-
-if $nimsdk
-then
-    echo " * adding nim-sdk to wasm-sdk"
+    gosdk=${gosdk:-false}
+    rustsdk=${rustdsk:-false}
+    nimsdk=${nimsdk:-false}
 fi
 
+for lang in wasisdk gosdk rustsdk nimsdk
+do
+    if ${!lang:-false}
+    then
+        echo " * adding ${lang} to wasm-sdk"
+    fi
+done
 
 if [ -d ${SDKROOT} ]
 then
@@ -148,8 +170,11 @@ END
         then
             echo "keeping installed wasmtime and wasi binaries"
         else
-            #wget https://github.com/bytecodealliance/wasmtime/releases/download/v22.0.0/wasmtime-v22.0.0-x86_64-linux.tar.xz \
-            wget https://github.com/bytecodealliance/wasmtime/releases/download/v23.0.2/wasmtime-v23.0.2-$(arch)-linux.tar.xz \
+            #wget https://github.com/bytecodealliance/wasmtime/releases/download/v22.0.0/wasmtime-v22.0.0-x86_64-linux.tar.xz
+
+# TODO: window only has a zip archive, better use wasmtime-py instead.
+
+            wget https://github.com/bytecodealliance/wasmtime/releases/download/v26.0.1/wasmtime-v26.0.1-$(arch)-$(PLATFORM).tar.xz \
              -O-|xzcat|tar xfv -
             mv -vf $(find wasmtime*|grep /wasmtime$) ${SDKROOT}/devices/$(arch)/usr/bin
         fi
@@ -290,7 +315,7 @@ END
 
         if $nimsdk
         then
-            ${SDKROOT}/python-nim-sdk.sh
+            ${SDKROOT}/lang/nimsdk.sh
         fi
 
         mkdir -p /tmp/sdk

scripts/cpython-build-emsdk-prebuilt.sh

@@ -80,6 +80,24 @@ fi
 # cannot use wasi ninja yet
 $HPIP install --force ninja
 
+# patch ninja for jobs limit and wrapper detection
+# https://github.com/ninja-build/ninja/issues/1482
+
+cat > ${HOST_PREFIX}/bin/ninja <<END
+#!${HOST_PREFIX}/bin/python${PYBUILD}
+# -*- coding: utf-8 -*-
+import re
+import sys
+sys.argv.insert(1,'1')
+sys.argv.insert(1,'-j')
+import os
+os.environ['NINJA']="1"
+from ninja import ninja
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?\$', '', sys.argv[0])
+    sys.exit(ninja())
+END
+
 echo "
     *   cpython-build-emsdk-prebuilt pip==$PIP   *
 " 1>&2
@@ -131,3 +149,30 @@ rm ${SDKROOT}/prebuilt/emsdk/common/site-packages/installer/_scripts/*exe
 
 
 
+
+
+# SDL2 is prebuilt in emsdk but lacks SDL2.pc
+
+cat > ${PREFIX}/lib/pkgconfig/sdl2.pc <<END
+# sdl pkg-config source file
+
+prefix=${PREFIX}
+exec_prefix=\${prefix}
+libdir=\${exec_prefix}/lib
+includedir=\${prefix}/include
+
+Name: sdl2
+Description: Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D v>
+Version: 2.31.0
+Requires.private:
+Conflicts:
+Libs: -L\${libdir} -lSDL2 -lm
+Cflags: -I\${includedir} -I\${includedir}/SDL2
+END
+
+
+
+
+
+
+

scripts/cpython-build-emsdk.sh

@@ -373,7 +373,7 @@ else
     . emsdk/emsdk_env.sh
     popd
     export PATH=$SDKROOT/emsdk/upstream/emscripten:$SDKROOT/emsdk/upstream/emscripten/system/bin:\$PATH
-    export PKG_CONFIG_SYSROOT_DIR="${SDKROOT}/devices/emsdk"
+    # export PKG_CONFIG_SYSROOT_DIR="${SDKROOT}/devices/emsdk"
     export PKG_CONFIG_LIBDIR="${SDKROOT}/emsdk/upstream/emscripten/system/lib/pkgconfig"
     export PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig:${HOST_PREFIX}/lib/pkgconfig"
     export NODE=\$(find \$EMSDK|grep /bin/node\$)

scripts/cpython-build-wasisdk.sh

@@ -63,8 +63,8 @@ END
 #        sed -i 's| -Wl,--stack-first -Wl,--initial-memory=10485760| --stack-first --initial-memory=10485760|g' $PYSRC/configure
 
         LDSHARED="${SDKROOT}/wasisdk/upstream/bin/wasm-ld --no-entry" CONFIG_SITE=$PYSRC/Tools/wasm/config.site-wasm32-wasisdk \
-        $PYSRC/configure -C \
-        --with-c-locale-coercion --without-pymalloc --disable-ipv6  --disable-gil --with-ensurepip=no \
+        $PYSRC/configure -C $GIL \
+        --with-c-locale-coercion --without-pymalloc --disable-ipv6  --with-ensurepip=no \
         --prefix=${PREFIX} \
         --host=wasm32-unknown-wasi --with-suffix=.wasm \
         --build=$($PYSRC/config.guess) \

scripts/emsdk-fetch.sh

@@ -513,7 +513,7 @@ END
     # EM_PKG_CONFIG_PATH ?
     # https://emscripten.org/docs/compiling/Building-Projects.html#pkg-config
 
-    export PKG_CONFIG_SYSROOT_DIR="${SDKROOT}/devices/emsdk"
+    # export PKG_CONFIG_SYSROOT_DIR="${SDKROOT}/devices/emsdk"
     export PKG_CONFIG_LIBDIR="${SDKROOT}/emsdk/upstream/emscripten/system/lib/pkgconfig"
     export PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig:${HOST_PREFIX}/lib/pkgconfig"
     export EM_PKG_CONFIG_PATH=$PKG_CONFIG_PATH