Merge branch 'pygame-web:main' into main

harfang3d · Mar 7, 2024 · 6ade9fe · 6ade9fe
2 parents 57b966c + c99518b
commit 6ade9fe
Show file tree

Hide file tree

Showing 19 changed files with 225 additions and 126 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,12 +6,12 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     env:
-        SDK_VERSION: 3.1.54.1bi
+        SDK_VERSION: 3.1.56.0bi
         SYS_PYTHON: /usr/bin/python3
         PACKAGES: emsdk hpy pygame
         BUILD_STATIC: emsdk hpy
         STATIC: false
-        BUILDS: 3.11 3.12 3.13
+        BUILDS: 3.12 3.13
         CYTHON: Cython-3.0.8-py2.py3-none-any.whl
         LD_VENDOR: -sUSE_GLFW=3
 
@@ -36,17 +36,17 @@ jobs:
             sudo apt-get update 2>&1 >/dev/null
             sudo apt-get install -y bash git curl wget lz4 pv 2>&1 >/dev/null
 
-
-    - name: build 3.11 packages
-      run: |
-            cd $GITHUB_WORKSPACE
-            PYBUILD=3.11 PACKAGES="emsdk hpy _ctypes pygame" BUILD_STATIC="emsdk _ctypes hpy"  bash ./scripts/build-pkg.sh
-
-    - name: build 3.11 loader
-      run: |
-            cd $GITHUB_WORKSPACE
-            PYBUILD=3.11 PACKAGES="emsdk hpy _ctypes pygame" BUILD_STATIC="emsdk _ctypes hpy" bash ./scripts/build-loader.sh
-
+#
+#    - name: build 3.11 packages
+#      run: |
+#            cd $GITHUB_WORKSPACE
+#            PYBUILD=3.11 PACKAGES="emsdk hpy _ctypes pygame" BUILD_STATIC="emsdk _ctypes hpy"  bash ./scripts/build-pkg.sh
+#
+#    - name: build 3.11 loader
+#      run: |
+#            cd $GITHUB_WORKSPACE
+#            PYBUILD=3.11 PACKAGES="emsdk hpy _ctypes pygame" BUILD_STATIC="emsdk _ctypes hpy" bash ./scripts/build-loader.sh
+#
 
     - name: build 3.12 packages
       run: |

diff --git a/packages.d/hpy/hpy.sh b/packages.d/hpy/hpy.sh
@@ -57,52 +57,59 @@ popd
 
 pushd external/hpy
 
-# build for host simulator
+# build and install for host simulator
 ${HPY} setup.py install
 
-# build for wasm
-${SDKROOT}/python3-wasm setup.py install
-
+# ${SDKROOT}/python3-wasm setup.py install
+${SDKROOT}/python3-wasm setup.py build
 
 # link static
 . ${SDKROOT}/emsdk/emsdk_env.sh
 
     $SDKROOT/emsdk/upstream/emscripten/emar rcs /opt/python-wasm-sdk/prebuilt/emsdk/libhpy${PYMAJOR}.${PYMINOR}.a \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/debug/src/_debugmod.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/debug/src/autogen_debug_wrappers.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/debug/src/debug_ctx.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/debug/src/debug_ctx_cpython.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/debug/src/debug_handles.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/debug/src/dhqueue.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/debug/src/memprotect.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/debug/src/stacktrace.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/argparse.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/buildvalue.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/ctx_bytes.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/ctx_call.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/ctx_capsule.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/ctx_contextvar.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/ctx_err.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/ctx_eval.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/ctx_listbuilder.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/ctx_long.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/ctx_module.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/ctx_object.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/ctx_tracker.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/ctx_tuple.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/ctx_tuplebuilder.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/ctx_type.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/format.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/helpers.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/structseq.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/trace/src/_tracemod.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/trace/src/autogen_trace_func_table.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/trace/src/autogen_trace_wrappers.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/trace/src/trace_ctx.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/universal/src/ctx.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/universal/src/ctx_meth.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/universal/src/ctx_misc.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/universal/src/hpymodule.o
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/debug/src/_debugmod.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/debug/src/autogen_debug_wrappers.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/debug/src/debug_ctx.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/debug/src/debug_ctx_cpython.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/debug/src/debug_handles.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/debug/src/dhqueue.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/debug/src/memprotect.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/debug/src/stacktrace.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/argparse.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/buildvalue.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/ctx_bytes.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/ctx_call.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/ctx_capsule.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/ctx_contextvar.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/ctx_err.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/ctx_eval.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/ctx_listbuilder.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/ctx_long.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/ctx_module.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/ctx_object.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/ctx_tracker.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/ctx_tuple.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/ctx_tuplebuilder.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/ctx_type.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/format.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/helpers.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/structseq.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/trace/src/_tracemod.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/trace/src/autogen_trace_func_table.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/trace/src/autogen_trace_wrappers.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/trace/src/trace_ctx.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/universal/src/ctx.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/universal/src/ctx_meth.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/universal/src/ctx_misc.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/universal/src/hpymodule.o
+
+if [ -f /pp ]
+then
+    # build wheel for wasm
+    ${SDKROOT}/python3-wasm -m build --no-isolation .
+
+    mv dist/*wasm*whl /data/git/archives/repo/pkg/
+fi
 
 popd
 

diff --git a/scripts/build-loader.sh b/scripts/build-loader.sh
@@ -4,7 +4,19 @@
 
 . ${CONFIG:-$SDKROOT/config}
 
-#
+if [ -f vendor/vendor.sh ]
+then
+    echo "  vendor build"
+    if ${ABI3:-false}
+    then
+    echo "  vendor build (abi3) $PYBUILD"
+        if echo $PYBUILD|grep -v -q 3.12$
+        then
+            echo "abi3 vendor build only, skipping $PYBUILD"
+            exit 0
+        fi
+    fi
+fi
 
 ln -s $(pwd)/src/pygbag $(pwd)/pygbag
 
@@ -236,7 +248,9 @@ then
 
 # TODO: test -sWEBGL2_BACKWARDS_COMPATIBILITY_EMULATION
 
-    LDFLAGS="-sUSE_GLFW=3 -sUSE_WEBGL2 -sMIN_WEBGL_VERSION=2 -sOFFSCREENCANVAS_SUPPORT=1 -sFULL_ES2 -sFULL_ES3"
+#
+
+    LDFLAGS="-sUSE_GLFW=3 -sUSE_WEBGL2 -sMIN_WEBGL_VERSION=2 -sMAX_WEBGL_VERSION=2 -sOFFSCREENCANVAS_SUPPORT=1 -sFULL_ES2 -sFULL_ES3"
 
     LDFLAGS="$LDFLAGS -lsqlite3"
 

diff --git a/scripts/build-pkg.sh b/scripts/build-pkg.sh
@@ -2,6 +2,20 @@
 
 . scripts/vendoring.sh
 
+if [ -f vendor/vendor.sh ]
+then
+    echo "  vendor build"
+    if ${ABI3:-false}
+    then
+    echo "  vendor build (abi3) $PYBUILD"
+        if echo $PYBUILD|grep -v -q 3.12$
+        then
+            echo "abi3 vendor build only, skipping $PYBUILD"
+            exit 0
+        fi
+    fi
+fi
+
 export PYMAJOR=$(echo -n $PYBUILD|cut -d. -f1)
 export PYMINOR=$(echo -n $PYBUILD|cut -d. -f2)
 

diff --git a/scripts/build-pkpy.sh b/scripts/build-pkpy.sh
@@ -1,4 +1,11 @@
 #!/bin/bash
+
+if [ -f vendor/vendor.sh ]
+then
+    echo "vendor build, skipping"
+    exit 0
+fi
+
 reset
 
 PW=$(realpath patchwork/pykpocket)

diff --git a/src/pygbag/aio.py b/src/pygbag/aio.py
@@ -34,7 +34,9 @@
     if aio.pep0723.Config.dev_mode:
         aio.pep0723.Config.PKG_INDEXES.extend(["http://localhost:8000/archives/repo/"])
     else:
-        aio.pep0723.Config.PKG_INDEXES.extend(["https://pygame-web.github.io/archives/repo/"])
+        aio.pep0723.Config.PKG_INDEXES.extend([
+            os.environ.get('PYGPY', "https://pygame-web.github.io/archives/repo/"),
+        ])
 
     import pygbag.__main__
 

diff --git a/src/pygbag/app.py b/src/pygbag/app.py
@@ -36,6 +36,7 @@
 DEFAULT_CONSOLE = 25
 DEFAULT_LINES = 57
 DEFAULT_COLUMNS = 132
+DEFAULT_PYBUILD = "3.12"
 
 CACHE_ROOT = Path("build")
 CACHE_PATH = CACHE_ROOT / "web-cache"
@@ -161,17 +162,21 @@ def make_cache_dirs():
 
     if clear_cache:
         win32 = sys.platform == "win32"
-        if shutil.rmtree.avoids_symlink_attacks or win32:
-            if cache_dir.is_dir():
+        if cache_dir.is_dir():
+            if shutil.rmtree.avoids_symlink_attacks or win32:
                 if win32:
                     warnings.warn("clear cache : rmtree is not safe on that system (win32)")
                 shutil.rmtree(cache_dir.as_posix())
-        else:
-            print(
-                "115: cannot clear cache : rmtree is not safe on that system",
-                file=sys.stderr,
-            )
-            raise SystemExit(115)
+            else:
+                print(
+                    "171: cannot clear cache : rmtree is not safe on that system",
+                    file=sys.stderr,
+                )
+                print(
+                    "175: Please remove build folder manually",
+                    file=sys.stderr,
+                )
+                raise SystemExit(115)
 
         # rebuild
         make_cache_dirs()
@@ -210,8 +215,8 @@ async def main_run(app_folder, mainscript, cdn=DEFAULT_CDN):
 
     parser.add_argument(
         "--PYBUILD",
-        default="3.11",
-        help="Specify python version [default:%s]" % "3.11",
+        default=DEFAULT_PYBUILD,
+        help="Specify python version [default:%s]" % DEFAULT_PYBUILD,
     )
 
     parser.add_argument(

diff --git a/src/pygbag/filtering.py b/src/pygbag/filtering.py
@@ -16,6 +16,7 @@
 /.github
 /.vscode
 /.idea
+/.DS_Store
 /dist
 /build
 /venv
@@ -26,7 +27,7 @@
     "\n"
 )
 
-SKIP_EXT = ["pyc", "pyx", "pyd", "pyi", "exe", "log", "blend", "DS_Store"]
+SKIP_EXT = ["pyc", "pyx", "pyd", "pyi", "exe", "bak", "log", "blend", "DS_Store"]
 
 
 def filter(walked):

diff --git a/src/pygbag/optimizing.py b/src/pygbag/optimizing.py
@@ -44,7 +44,10 @@ def optimize(folder, filenames, **kw):
 
     def optimize(folder, filenames, **kw):
         global BAD
-        print("optimizing", folder)
+        if "--no_opt" in sys.argv:
+            print("NOT optimizing", folder)
+        else:
+            print("optimizing", folder)
         png_quality = 50
 
         done_list = []
@@ -57,10 +60,13 @@ def optimize(folder, filenames, **kw):
         except ImportError:
             warnings.warn(f"Black not found for processing {folder=}")
 
-        if os.popen("pngquant 2>&1").read().count("pngfile"):
-            print(f"    -> with pngquant --quality {png_quality}", folder)
+        if "--no_opt" in sys.argv:
+            pass
         else:
-            png_quality = -1
+            if os.popen("pngquant 2>&1").read().count("pngfile"):
+                print(f"    -> with pngquant --quality {png_quality}", folder)
+            else:
+                png_quality = -1
 
         has_ffmpeg = os.popen("ffmpeg -version").read().count("version")