0.4.5

Author: pmp-p

config

@@ -1,6 +1,6 @@
 #!/bin/bash
 export LC_ALL=C
-export ROOT=$(pwd)
+export ROOT=${ROOT:-$(pwd)}
 export SDKROOT=${SDKROOT:-$ROOT}
 
 export PYTHONDONTWRITEBYTECODE=1
@@ -11,35 +11,20 @@ export PYBUILD=${PYBUILD:-3.11}
 export PYMAJOR=$(echo -n $PYBUILD|cut -d. -f1)
 export PYMINOR=$(echo -n $PYBUILD|cut -d. -f2)
 
-
 export HOST_PREFIX=${HOST_PREFIX:-${SDKROOT}/devices/$(arch)/usr}
 export PREFIX=${PREFIX:-${SDKROOT}/devices/emsdk/usr}
-export PYTHONPYCACHEPREFIX=$(realpath ${SDKROOT}/build/pycache)
 
+mkdir -p ${SDKROOT}/build/pycache
+export PYTHONPYCACHEPREFIX=${PYTHONPYCACHEPREFIX:-$(realpath ${SDKROOT}/build/pycache)}
 
-# this is python used for emsdk : ${SYS_PYTHON} -> ${EMSDK_PYTHON}
-for py in 10 9 8 7
-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 HOME=${SDKROOT}
 
 export HPY=${HOST_PREFIX}/bin/python${PYBUILD}
 export PIP=${HOST_PREFIX}/bin/pip${PYBUILD}
 
 # cpython build opts
 export CPOPTS="-Os -g0 -fPIC"
-export CPPFLAGS="-I$PREFIX/include"
-export LDFLAGS="-msoft-float -L$PREFIX/lib"
 
-# module build opts
-export CFLDPFX="$CPPFLAGS $LDFLAGS -Wno-unused-command-line-argument"
 
 if [ -f ${ROOT}/dev ]
 then
@@ -55,6 +40,7 @@ else
     fi
 fi
 
+
 #stable
 # EMFLAVOUR=latest
 # EMFLAVOUR=${EMFLAVOUR:-latest}
@@ -67,23 +53,26 @@ export EMSDK_NUM_CORES=1
 
 export PYDK_PYTHON_HOST_PLATFORM=wasm32-$EMFLAVOUR-emscripten
 
-if echo $LD_LIBRARY_PATH |grep -q ${HOST}/lib
-then
-    # config already set
-    echo -n
-else
-    #export LD_LIBRARY_PATH="${HOST_PREFIX}/lib:$LD_LIBRARY_PATH"
-    export LD_LIBRARY_PATH="${HOST_PREFIX}/lib"
-fi
-
-if [[ ! -z ${PYDK+z} ]]
+if echo $LD_LIBRARY_PATH |grep -q ${HOST_PREFIX}/lib
 then
     # config already set
     echo -n
 else
-    mkdir -p src
-    export PKG_CONFIG_PATH="${HOST_PREFIX}/lib/pkgconfig"
-    export PATH="${HOST_PREFIX}/bin:$PATH"
-    export PYDK=minimal
+    OLDPATH=${PATH}
+    PATH=/usr/local/bin:/usr/bin:/opt/bin:/bin
+    # this is python used for emsdk : ${SYS_PYTHON} -> ${EMSDK_PYTHON}
+    for py in 10 9 8 7
+    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 LD_LIBRARY_PATH="${HOST_PREFIX}/lib:$LD_LIBRARY_PATH"
+    export PATH="${HOST_PREFIX}/bin:$OLDPATH"
 fi
-

python-wasm-sdk.sh

@@ -8,15 +8,14 @@ reset
 . /etc/lsb-release
 DISTRIB="${DISTRIB_ID}-${DISTRIB_RELEASE}"
 
-export SDKDIR=/opt/python-wasm-sdk
 export SDKROOT=/opt/python-wasm-sdk
 
 export CIVER=${CIVER:-$DISTRIB}
 export CI=true
 
 
-sudo mkdir -p ${SDKDIR}
-sudo chmod 777 ${SDKDIR}
+sudo mkdir -p ${SDKROOT}
+sudo chmod 777 ${SDKROOT}
 
 ORIGIN=$(pwd)
 
@@ -28,13 +27,18 @@ for PYBUILD in $BUILDS
 do
     cd "$ORIGIN"
 
-    [ -f ${SDKDIR}/dev ] || rm -rf ${SDKDIR}/*
+    if [ -f ${SDKROOT}/dev ]
+    then
+        rm ${SDKROOT}/embuild.done
+    else
+        rm -rf ${SDKROOT}/*
+    fi
+
 
-    cp -Rf * ${SDKDIR}/
+    cp -Rf * ${SDKROOT}/
 
-    if cd ${SDKDIR}/
+    if cd ${SDKROOT}/
     then
-        pwd
         mkdir -p build/pycache
         export PYTHONDONTWRITEBYTECODE=1
 
@@ -43,17 +47,19 @@ do
 
         . ${CONFIG:-config}
 
-        cd ${SDKDIR}
+        cd ${SDKROOT}
         . scripts/cpython-fetch.sh
 
-        cd ${SDKDIR}
+        cd ${SDKROOT}
         . support/__EMSCRIPTEN__.sh
 
         . scripts/cpython-build-host.sh 2>&1 >/dev/null
 
         . scripts/cpython-build-host-deps.sh
 # >/dev/null
 
+        [ -f /lowend ] && sleep 45
+
         # use ./ or emsdk will pollute env
         ./scripts/emsdk-fetch.sh
 
@@ -63,12 +69,13 @@ do
             echo " ------------------- building cpython wasm plus $PYBUILD $CIVER -------------------"
             if ./scripts/cpython-build-emsdk-deps.sh > /dev/null
             then
+                [ -f /lowend ] && sleep 45
                 echo "
 
                 ==========================================================
                                     stripping emsdk
                 ==========================================================
-        "
+        " 1>&2
                     rm -rf ${SDKROOT}/emsdk/upstream/emscripten/cache/ports*
                     # something triggers sdl2 *full* rebuild in pygame.
                     # but only that one.
@@ -78,37 +85,46 @@ do
                     rm -rf ${SDKROOT}/emsdk/upstream/emscripten/cache/ports
                     rm -rf ${SDKROOT}/emsdk/upstream/emscripten/cache/ports-builds
                     rm -rf ${SDKROOT}/emsdk/upstream/emscripten/tests
-        #
 
-                echo "making tarball"
+
+                echo "making tarball" 1>&2
 
                 cd /
                 mkdir -p /tmp/sdk
                 tar -cpPR \
-                    ${SDKDIR}/config \
-                    ${SDKDIR}/build/pycache/.??* \
-                    ${SDKDIR}/build/pycache/sysconfig/_sysconfigdata__emscripten_debug.py \
-                    ${SDKDIR}/python3-wasm \
-                    ${SDKDIR}/wasm32-*-shell.sh \
-                    ${SDKDIR}/emsdk \
-                    ${SDKDIR}/devices/* \
-                    ${SDKDIR}/prebuilt/* \
+                    ${SDKROOT}/config \
+                    ${SDKROOT}/python3-wasm \
+                    ${SDKROOT}/wasm32-*-shell.sh \
+                    ${SDKROOT}/emsdk \
+                    ${SDKROOT}/devices/* \
+                    ${SDKROOT}/prebuilt/* \
                      > /tmp/sdk/python${PYBUILD}-wasm-sdk-${CIVER}.tar
                     lz4 -c --favor-decSpeed --best /tmp/sdk/python${PYBUILD}-wasm-sdk-${CIVER}.tar \
                      > /tmp/sdk/python${PYBUILD}-wasm-sdk-${CIVER}.tar.lz4
-                    # bzip2 will remove original
-                    bzip2 -9 /tmp/sdk/python${PYBUILD}-wasm-sdk-${CIVER}.tar
+
+                    if [ -f /lowend ]
+                    then
+                        # bzip2 is energy waste for local build
+                        rm /tmp/sdk/python${PYBUILD}-wasm-sdk-${CIVER}.tar
+                    else
+                        # bzip2 will remove original
+                        [ -f /lowend ] || bzip2 -9 /tmp/sdk/python${PYBUILD}-wasm-sdk-${CIVER}.tar
+                    fi
             else
-                echo " cpython-build-emsdk-deps failed"
-                exit 2
+                echo " cpython-build-emsdk-deps failed" 1>&2
+                exit 111
             fi
         else
-            echo " cpython-build-emsdk failed"
-            exit 1
+            echo " cpython-build-emsdk failed" 1>&2
+            exit 115
         fi
 
-        echo done
+        echo "done"  1>&2
+
+        # cool down
+        [ -f /lowend ] && sleep 60
     else
-        echo failed
+        echo "cd failed"  1>&2
+        exit 124
     fi
 done