Skip to content

Commit 9da289f

Browse files
committed
bump sdk
1 parent 8cd5077 commit 9da289f

File tree

4 files changed

+17
-7
lines changed

4 files changed

+17
-7
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
build:
77
runs-on: ubuntu-22.04
88
env:
9-
SDK_VERSION: 3.1.65.5bi
9+
SDK_VERSION: 3.1.65.8bi
1010
SYS_PYTHON: /usr/bin/python3
1111
PACKAGES: emsdk hpy pygame
1212
BUILD_STATIC: emsdk hpy

scripts/build-loader.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ then
1818
fi
1919
fi
2020

21-
ln -s $(pwd)/src/pygbag $(pwd)/pygbag
21+
ln -sf $(pwd)/src/pygbag $(pwd)/pygbag
2222

2323
pushd src/pygbag/support
2424
cp -r _xterm_parser ${SDKROOT}/prebuilt/emsdk/common/site-packages/

src/pygbag/support/cross/__EMSCRIPTEN__.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,19 +245,21 @@ async def process(self):
245245
ROOTDIR = f"/data/data/{sys.argv[0]}/assets"
246246

247247

248-
def explore(root):
248+
def explore(root, verbose=False):
249249
global prelist, preloading
250250

251+
import embed
252+
251253
if preloading < 0:
252254
preloading = 0
253255

254-
import shutil
255-
256256
for current, dirnames, filenames in os.walk(root):
257257
for filename in filenames:
258258
if filename.endswith(".so"):
259259
preloading += 1
260260
src = f"{current}/{filename}"
261+
if verbose:
262+
print(f"# 260: preload {src=}")
261263
embed.preload(src)
262264

263265

src/pygbag/support/cross/aio/pep0723.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ class Config:
7373
"python_i18n": "i18n",
7474
"pillow": "PIL",
7575
"pyglm" : "glm",
76+
"opencv_python" : "cv2",
7677
}
7778

7879

@@ -201,7 +202,7 @@ async def async_repos():
201202
print("200: async_repos", Config.PKG_INDEXES)
202203

203204
for repo in Config.PKG_INDEXES:
204-
idx = f"{repo}index-090-{abitag}.json"
205+
idx = f"{repo}index-0.9.2-{abitag}.json"
205206
try:
206207
async with fopen(idx, "r", encoding="UTF-8") as index:
207208
try:
@@ -435,8 +436,15 @@ async def check_list(code=None, filename=None):
435436
if not aio.cross.simulator:
436437
import platform
437438
import asyncio
439+
print(f'# 439: Scanning {sconf["platlib"]} for WebAssembly library')
440+
platform.explore(sconf["platlib"], verbose=True)
441+
for compilation in range(1+embed.preloading()):
438442

439-
platform.explore(sconf["platlib"])
443+
await asyncio.sleep(0)
444+
if embed.preloading()<=0:
445+
break
446+
else:
447+
print("# 442: ERROR: remaining wasm {embed.preloading()}")
440448
await asyncio.sleep(0)
441449

442450
do_patches()

0 commit comments

Comments
 (0)