Skip to content

Commit

Permalink
merge upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
@electronstudio
electronstudio committed Nov 15, 2024
2 parents 58a143f + c39774f commit 68ae3cf
Show file tree
Hide file tree
Showing 45 changed files with 814 additions and 439 deletions.
38 changes: 19 additions & 19 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ jobs:
build:
runs-on: ubuntu-22.04
env:
SDK_VERSION: 3.1.62.1bi
SDK_VERSION: 3.1.70.7bi
SYS_PYTHON: /usr/bin/python3
PACKAGES: emsdk hpy pygame
BUILD_STATIC: emsdk hpy
PACKAGES: emsdk pygame
BUILD_STATIC: emsdk
STATIC: false
BUILDS: 3.12 3.13
CYTHON: Cython-3.0.10-py2.py3-none-any.whl
BUILDS: 3.12 3.13 3.14
CYTHON: Cython-3.0.11-py2.py3-none-any.whl
LD_VENDOR: -sUSE_GLFW=3

steps:
Expand Down Expand Up @@ -47,6 +47,7 @@ jobs:
# cd $GITHUB_WORKSPACE
# PYBUILD=3.11 PACKAGES="emsdk hpy _ctypes pygame" BUILD_STATIC="emsdk _ctypes hpy" bash ./scripts/build-loader.sh
#
# PACKAGES="emsdk pygame" BUILD_STATIC="emsdk"

- name: build 3.12 packages
run: |
Expand Down Expand Up @@ -83,6 +84,17 @@ jobs:
cd $GITHUB_WORKSPACE
PYBUILD=3.13 bash ./scripts/build-loader.sh
- name: build 3.14 packages
run: |
cd $GITHUB_WORKSPACE
PYBUILD=3.14 bash ./scripts/build-pkg.sh
- name: build 3.14 loader
run: |
cd $GITHUB_WORKSPACE
PYBUILD=3.14 bash ./scripts/build-loader.sh
- name: build PkPy loader
run: |
cd $GITHUB_WORKSPACE
Expand All @@ -91,28 +103,16 @@ jobs:
- name: publishing
run: |
cd $GITHUB_WORKSPACE
touch build/web/archives/.nojekyll
echo "<html></html>" > build/web/archives/index.html
- name: make wheel
run: |
cd $GITHUB_WORKSPACE
/opt/python-wasm-sdk/python3-wasm -m build --no-isolation .
- name: Upload sdk to Github Releases
if: github.event_name == 'release'
uses: svenstaro/upload-release-action@2.3.0
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: $GITHUB_WORKSPACE/dist/*
file_glob: true
tag: ${{ github.ref }}


- name : "Upload to GitHub pages"
uses: JamesIves/github-pages-deploy-action@v4.4.1
uses: JamesIves/github-pages-deploy-action@v4.6.3
with:
branch: gh-pages
folder: build/web/archives



2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ dmypy.json

/0.0
/.eric6project
/src
# /src
/dist
/ATTIC
/platform_wasm
Expand Down
Empty file added .nojekyll
View file
Empty file.
3 changes: 2 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Serving python files from [/data/git/pygbag/test/build/web]
with no security/performance in mind, i'm just a test tool : don't rely on me
usage: __main__.py [-h] [--bind ADDRESS] [--PYBUILD PYBUILD] [--app_name APP_NAME] [--ume_block UME_BLOCK] [--can_close CAN_CLOSE] [--cache CACHE] [--package PACKAGE] [--title TITLE] [--version VERSION] [--build] [--html] [--no_opt] [--archive] [--icon ICON] [--cdn CDN] [--template TEMPLATE] [--ssl SSL]
[--port [PORT]]
[--port [PORT]] [--disable-sound-format-error]
options:
-h, --help show this help message and exit
Expand All @@ -103,6 +103,7 @@ options:
--template TEMPLATE index.html template [default:default.tmpl]
--ssl SSL enable ssl with server.pem and key.pem
--port [PORT] Specify alternate port [default: 8000]
--disable-sound-format-error audio files with a common unsupported format found in the assets won't raise an exception
```

unlisted developper options:
Expand Down
76 changes: 41 additions & 35 deletions packages.d/hpy/hpy.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,42 +66,48 @@ PYTHONOPTIMIZE=TRUE ${SDKROOT}/python3-wasm -O setup.py build
# link static
. ${SDKROOT}/emsdk/emsdk_env.sh

if echo ${PYMAJOR}${PYMINOR}|grep -q 313
then
export PYTHR="t"
fi


$SDKROOT/emsdk/upstream/emscripten/emar rcs /opt/python-wasm-sdk/prebuilt/emsdk/libhpy${PYMAJOR}.${PYMINOR}.a \
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
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/debug/src/_debugmod.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/debug/src/autogen_debug_wrappers.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/debug/src/debug_ctx.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/debug/src/debug_ctx_cpython.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/debug/src/debug_handles.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/debug/src/dhqueue.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/debug/src/memprotect.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/debug/src/stacktrace.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/devel/src/runtime/argparse.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/devel/src/runtime/buildvalue.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/devel/src/runtime/ctx_bytes.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/devel/src/runtime/ctx_call.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/devel/src/runtime/ctx_capsule.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/devel/src/runtime/ctx_contextvar.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/devel/src/runtime/ctx_err.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/devel/src/runtime/ctx_eval.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/devel/src/runtime/ctx_listbuilder.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/devel/src/runtime/ctx_long.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/devel/src/runtime/ctx_module.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/devel/src/runtime/ctx_object.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/devel/src/runtime/ctx_tracker.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/devel/src/runtime/ctx_tuple.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/devel/src/runtime/ctx_tuplebuilder.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/devel/src/runtime/ctx_type.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/devel/src/runtime/format.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/devel/src/runtime/helpers.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/devel/src/runtime/structseq.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/trace/src/_tracemod.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/trace/src/autogen_trace_func_table.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/trace/src/autogen_trace_wrappers.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/trace/src/trace_ctx.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/universal/src/ctx.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/universal/src/ctx_meth.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/universal/src/ctx_misc.o \
build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}${PYTHR}/hpy/universal/src/hpymodule.o

# local publish
if [ -d $WHEELS ]
Expand Down
Loading

0 comments on commit 68ae3cf

Please sign in to comment.