add /opt/python-wasm-sdk/python3-wasm ready to use from CI

Author: pmp-p

config

@@ -1,17 +1,28 @@
 #!/bin/bash
 export LC_ALL=C
+export ROOT=${ROOT:-/opt/python-wasm-sdk}
+
 export PYTHONDONTWRITEBYTECODE=1
 export REBUILD=${REBUILD:-false}
-export ROOT=/opt/python-wasm-sdk
-mkdir -p /opt/python-wasm-sdk/build/pycache
+export CI=${CI:-false}
+
 export HOST_PREFIX=${HOST_PREFIX:-$ROOT/devices/$(arch)/usr}
 export PREFIX=${PREFIX:-${ROOT}/devices/emsdk/usr}
 export PYTHONPYCACHEPREFIX=$(realpath ${ROOT}/build/pycache)
 
 export HPY=$(echo -n ${HOST_PREFIX}/bin/python3.1?)
 export PIP=$(echo -n ${HOST_PREFIX}/bin/pip3.$(echo $HPY|cut -d. -f2))
 
-export CI=${CI:-false}
+# this is python used for emsdk
+for py in 10 9 8 7
+do
+    if command -v python3.${py} >/dev/null
+    then
+        export SYS_PYTHON=$(command -v python3.${py})
+        break
+    fi
+done
+
 
 # cpython build opts
 export CPOPTS="-Os -g0 -fPIC"
@@ -21,13 +32,13 @@ export LDFLAGS="-L$PREFIX/lib"
 # module build opts
 export CFLDPFX="$CPPFLAGS $LDFLAGS -Wno-unused-command-line-argument"
 
-if [ -f dev ]
+if [ -f ${ROOT}/dev ]
 then
     export COPTS="-O0 -g3 -fPIC"
-    export VERBOSE=""
+    export QUIET=""
 else
     export COPTS="-Os -g0 -fPIC"
-    export VERBOSE="2>&1 > $PYTHONPYCACHEPREFIX/.log"
+    export QUIET="2>&1 > $PYTHONPYCACHEPREFIX/.log"
 fi
 
 #stable

python-wasm-sdk.sh

@@ -5,10 +5,11 @@ export SDKDIR=/opt/python-wasm-sdk
 sudo mkdir -p ${SDKDIR}
 sudo chmod 777 ${SDKDIR}
 
-mv * ${SDKDIR}/
+cp -Rf * ${SDKDIR}/
 
 if cd ${SDKDIR}/
 then
+    pwd
     mkdir -p build/pycache
     export PYTHONDONTWRITEBYTECODE=1
 

scripts/cpython-build-emsdk.sh

@@ -6,6 +6,10 @@
 # fix /pip/_internal/operations/install/wheel.py
 # for allowing to avoid pyc creation
 
+    echo "
+    * building cpython-wasm EMSDK_PYTHON=$SYS_PYTHON
+"
+
 
 export PYTHON_FOR_BUILD=${PYTHON_FOR_BUILD:-${HOST_PREFIX}/bin/python3}
 
@@ -21,7 +25,7 @@ REBUILD_WASM=${REBUILD_WASMPY:-false}
 if $REBUILD || $REBUILD_WASMPY
 then
     rm -rf build/cpython-wasm/ build/pycache/config.cache
-    rm build/cpython-wasm/libpython3.??.a
+    rm build/cpython-wasm/libpython3.??.a 2>/dev/null
     REBUILD=true
 fi
 
@@ -63,6 +67,7 @@ else
 
     emmake make install >/dev/null
 
+    unset EMCC_CFLAGS
     popd
 
     cp -fv  ${PREFIX}/lib/libffi.a $EMSDK/upstream/emscripten/cache/sysroot/lib/wasm32-emscripten/pic/
@@ -126,13 +131,13 @@ else
      --build=$($ROOT/src/cpython/config.guess) \
      --with-emscripten-target=browser \
      --prefix=$PREFIX \
-     --with-build-python=${PYTHON_FOR_BUILD} $VERBOSE
+     --with-build-python=${PYTHON_FOR_BUILD} $QUIET
 
     #echo "#define HAVE_NCURSES_H" >> pyconfig.h
 
-    if EMCC_CFLAGS="-sUSE_ZLIB -sUSE_BZIP2" eval emmake make -j$(nproc) $VERBOSE
+    if EMCC_CFLAGS="-sUSE_ZLIB -sUSE_BZIP2" eval emmake make -j$(nproc) $QUIET
     then
-        EMCC_CFLAGS="-sUSE_ZLIB -sUSE_BZIP2" eval emmake make install $VERBOSE
+        EMCC_CFLAGS="-sUSE_ZLIB -sUSE_BZIP2" eval emmake make install $QUIET
     else
         echo " **** cpython wasm build failed *** "
         exit 1
@@ -226,9 +231,8 @@ then
     # emsdk_env already parsed
     echo -n
 else
-    pushd $ROOT
-    . scripts/emsdk-fetch.sh
-    popd
+    . ${ROOT}/config
+    . ${ROOT}/emsdk/emsdk_env.sh
 fi
 
 export PATH=${HOST_PREFIX}/bin:\$PATH
@@ -248,19 +252,17 @@ export _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata__emscripten_
 
 cat >${PYTHONPYCACHEPREFIX}/.numpy-site.cfg <<NUMPY
 [DEFAULT]
-library_dirs = $PREFIX//lib
+library_dirs = $PREFIX/lib
 include_dirs = $PREFIX/include
 NUMPY
 
-
 END
 
 cat > $HOST_PREFIX/bin/python3-wasm <<END
 #!/bin/bash
 . $ROOT/${PYDK_PYTHON_HOST_PLATFORM}-shell.sh
 
 # most important
-#export EMCC_CFLAGS="-sSIDE_MODULE -DBUILD_STATIC -fPIC"
 export CC=cc
 export _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata__emscripten_debug
 
@@ -280,30 +282,11 @@ export PYTHONPATH=$PYTHONPYCACHEPREFIX/sysconfig:$(echo -n ${HOST_PREFIX}/lib/py
 export _PYTHON_HOST_PLATFORM=${PYDK_PYTHON_HOST_PLATFORM}
 export PYTHON_FOR_BUILD=${PYTHON_FOR_BUILD}
 
-$HOST_PREFIX/bin/python3.?? -u -B \$@
+$HPY -u -B \$@
 END
 
 chmod +x $HOST_PREFIX/bin/python3-wasm
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+cp -f $HOST_PREFIX/bin/python3-wasm ${ROOT}/
 
 
 unset PYTHON_FOR_BUILD
@@ -312,19 +295,3 @@ unset EMCC_CFLAGS
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

scripts/cpython-build-host-deps.sh

@@ -62,7 +62,7 @@ done
 
 
 rm cffi-branch-default.zip
-wget https://foss.heptapod.net/pypy/cffi/-/archive/branch/default/cffi-branch-default.zip
+wget -q https://foss.heptapod.net/pypy/cffi/-/archive/branch/default/cffi-branch-default.zip
 unzip -o -q cffi-branch-default.zip
 
 pushd cffi-branch-default
@@ -81,6 +81,7 @@ else
     popd
 fi
 
+
 if [ -d pymunk-4.0.0 ]
 then
     pushd pymunk-4.0.0

scripts/cpython-build-host.sh

@@ -61,9 +61,9 @@ then
     if \
     CC=clang CXX=clang++ \
     eval ${ROOT}/src/cpython/configure \
-     --prefix=$HOST_PREFIX $PYOPTS $VERBOSE
+     --prefix=$HOST_PREFIX $PYOPTS $QUIET
     then
-        eval make -j$(nproc) install $VERBOSE
+        eval make -j$(nproc) install $QUIET
         rm -rf $(find $ROOT/devices/ -type d|grep __pycache__$)
 
         cp -Rfv $ROOT/support/__EMSCRIPTEN__.patches/. $HOST_PREFIX/lib/python3.??/

scripts/cpython-fetch.sh

@@ -42,8 +42,8 @@ else
     #tar xf Python-3.11.0b1.tar.xz
     #ln -s Python-3.11.0b1 cpython
 
-    wget -q -c https://www.python.org/ftp/python/3.11.0/Python-3.11.0b3.tar.xz
-    tar xf Python-3.11.0b3.tar.xz
+    wget -q -c https://www.python.org/ftp/python/3.11.0/Python-3.11.0b3.tgz
+    tar xf Python-3.11.0b3.tgz
     ln -s Python-3.11.0b3 cpython
 fi
 

scripts/emsdk-fetch.sh

@@ -105,9 +105,9 @@ fi
 
 if \$IS_SHARED
 then
-    $EMSDK_PYTHON -E \$0.py $SHARED $LDFLAGS -Wno-unused-command-line-argument "\$@"
+    \$SYS_PYTHON -E \$0.py $SHARED $LDFLAGS -Wno-unused-command-line-argument "\$@"
 else
-    $EMSDK_PYTHON -E \$0.py $CPPFLAGS -Wno-unused-command-line-argument "\$@"
+    \$SYS_PYTHON -E \$0.py $CPPFLAGS -Wno-unused-command-line-argument "\$@"
 fi
 END
         cat emsdk/upstream/emscripten/emcc > emsdk/upstream/emscripten/em++
@@ -126,7 +126,7 @@ END
 
         cat > emsdk/upstream/emscripten/emconfigure <<END
 #!/bin/bash
-$EMSDK_PYTHON -E \$0.py "\$@"
+\$SYS_PYTHON -E \$0.py "\$@"
 END
 
         chmod +x emsdk/upstream/emscripten/em*