3.1.49pre

Author: pmp-p

config

@@ -42,12 +42,12 @@ fi
 
 
 #stable
-# embind broke after 3.1.34
 # export EMFLAVOUR=3.1.34
-# export EMFLAVOUR=${EMFLAVOUR:latest}
 
+# embind broke in 3.1.48-tot (coro suspend/resume)
 
-EMFLAVOUR=${EMFLAVOUR:-tot}
+#export EMFLAVOUR=${EMFLAVOUR:latest}
+export EMFLAVOUR=${EMFLAVOUR:-tot}
 
 
 # base wasm features pure is "mvp" , "bi" is bigint

python-wasi-sdk.sh

@@ -83,8 +83,22 @@ do
         then
             echo WASI SDK TODO
             > ${SDKROOT}/python3-wasi
+
+# ROOT=/opt/python-wasm-sdk SDKROOT=/opt/python-wasm-sdk
+# HOST_PREFIX=/opt/python-wasm-sdk/devices/$(arch)/usr
             > ${SDKROOT}/wasm32-wasi-shell.sh
 
+            CPU=wasm32 TARGET=wasi \
+             PYDK_PYTHON_HOST_PLATFORM=wasm32-wasi \
+             PREFIX=/opt/python-wasm-sdk/devices/wasi/usr \
+             ./scripts/make-shells.sh
+
+            cat >> $ROOT/wasm32-wasi-shell.sh <<END
+
+export PS1="[PyDK:wasisdk] \w $ "
+
+END
+
             chmod +x ${SDKROOT}/python3-wasi ${SDKROOT}/wasm32-wasi-shell.sh
 
             mkdir -p src build ${SDKROOT}/devices/wasi ${SDKROOT}/prebuilt/wasisdk

python-wasm-sdk.sh

@@ -83,8 +83,22 @@ do
         then
             echo WASI SDK TODO
             > ${SDKROOT}/python3-wasi
+
+# ROOT=/opt/python-wasm-sdk SDKROOT=/opt/python-wasm-sdk
+# HOST_PREFIX=/opt/python-wasm-sdk/devices/$(arch)/usr
             > ${SDKROOT}/wasm32-wasi-shell.sh
 
+            CPU=wasm32 TARGET=wasi \
+             PYDK_PYTHON_HOST_PLATFORM=wasm32-wasi \
+             PREFIX=/opt/python-wasm-sdk/devices/wasi/usr \
+             ./scripts/make-shells.sh
+
+            cat >> $ROOT/wasm32-wasi-shell.sh <<END
+
+export PS1="[PyDK:wasisdk] \w $ "
+
+END
+
             chmod +x ${SDKROOT}/python3-wasi ${SDKROOT}/wasm32-wasi-shell.sh
 
             mkdir -p src build ${SDKROOT}/devices/wasi ${SDKROOT}/prebuilt/wasisdk

scripts/cpython-build-emsdk-prebuilt.sh

@@ -2,7 +2,7 @@
 
 . ${CONFIG:-config}
 
-CYTHON_REL=${CYTHON_REL:-3.0.1}
+CYTHON_REL=${CYTHON_REL:-3.0.5}
 CYTHON_WHL=${CYTHON:-Cython-${CYTHON_REL}-py2.py3-none-any.whl}
 
 # all needed for PEP722/723
@@ -39,15 +39,14 @@ $PIP install --upgrade setuptools
 # /opt/python-wasm-sdk/python3-wasm setup.py bdist_wheel
 
 
-# cython get the latest release on gh
+# cython get the latest release on gh install on both host python and build python
 pushd build
     wget -q -c https://github.com/cython/cython/releases/download/${CYTHON_REL}/${CYTHON_WHL}
     $HPIP install --upgrade $CYTHON_WHL
 popd
 
 $PIP install build/$CYTHON_WHL
 
-
 # some we want to be certain to have in all minimal rootfs
 mkdir -p prebuilt/emsdk/common/site-packages/
 for pkg in pyparsing packaging installer pkg_resources

scripts/cpython-build-emsdk.sh

@@ -316,21 +316,17 @@ library_dirs = $PREFIX/lib
 include_dirs = $PREFIX/include
 NUMPY
 
-cat > $ROOT/${PYDK_PYTHON_HOST_PLATFORM}-shell.sh <<END
-#!/bin/bash
-export ROOT=${SDKROOT}
-export SDKROOT=${SDKROOT}
 
-export PYBUILD=\${PYBUILD:-$PYBUILD}
-export PYMAJOR=\$(echo -n \$PYBUILD|cut -d. -f1)
-export PYMINOR=\$(echo -n \$PYBUILD|cut -d. -f2)
+. scripts/make-shells.sh
+
+# C/C++/cmake shell
 
-export CARGO_HOME=\${CARGO_HOME:-${SDKROOT}}/rust
-export RUSTUP_HOME=\${RUSTUP_HOME:-${SDKROOT}}/rust
-mkdir -p \${CARGO_HOME}/bin
-export PATH=\${CARGO_HOME}/bin:\$PATH
+cat >> $ROOT/${PYDK_PYTHON_HOST_PLATFORM}-shell.sh <<END
 
-export PANDA_PRC_DIR=${SDKROOT}/support
+export PS1="[PyDK:emsdk] \w $ "
+
+export PYTHONSTARTUP="${SDKROOT}/support/__EMSCRIPTEN__.py"
+> \${HOME}/.pythonrc.py
 
 export EMSDK_QUIET=1
 export EM_IGNORE_SANITY=1
@@ -352,28 +348,11 @@ fi
 
 export SYS_PYTHON=${SYS_PYTHON}
 export EMSDK_PYTHON=${SYS_PYTHON}
-
-export PATH=${HOST_PREFIX}/bin:\$PATH:\${SDKROOT}/devices/emsdk/usr/bin
-export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
-
-export PLATFORM_TRIPLET=${PYDK_PYTHON_HOST_PLATFORM}
-export PREFIX=$PREFIX
-export PYTHONPYCACHEPREFIX=${PYTHONPYCACHEPREFIX:-$PYTHONPYCACHEPREFIX}
-mkdir -p \$PYTHONPYCACHEPREFIX
-
-# so pip does not think everything in ~/.local is useable
-export HOME=${SDKROOT}
-
-export PYTHONDONTWRITEBYTECODE=1
-export PYTHONSTARTUP="${SDKROOT}/support/__EMSCRIPTEN__.py"
-> \${HOME}/.pythonrc.py
-
-export PS1="[PyDK:wasm] \w $ "
-
 export _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata__emscripten_
 
 END
 
+# python shell
 cat > $HOST_PREFIX/bin/python3-wasm <<END
 #!/bin/bash
 
@@ -404,6 +383,8 @@ END
 
 chmod +x $HOST_PREFIX/bin/python3-wasm
 
+
+
 cp -f $HOST_PREFIX/bin/python3-wasm ${SDKROOT}/
 
 # TODO: FIXME: