admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix python search path in emsdk launcher scripts (#1571)

Browse Source 
The `-0` and `-1` suffixes here are not part of the install path which
only based on the `id` and `version` of the tool. e.g:

```
  {
    "id": "python",
    "version": "3.9.2",
    "bitness": 64,
    "arch": "x86_64",
    "windows_url": "python-3.9.2-1-embed-amd64+pywin32.zip",
    "activated_cfg": "PYTHON='%installation_dir%/python.exe'",
    "activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe"
  },
```

Here we have a `-1` in the archive name, but that is not included in the
version which is used to construct the install path.

Fixes: #1570
This commit is contained in:
Sam Clegg
2025-07-10 15:51:02 -07:00
committed by GitHub
parent 62a853cd3b
commit d845e506ce
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
emsdk
View File

@@ -8,9 +8,9 @@
# First look for python bundled in Emsdk # First look for python bundled in Emsdk
if [ -z "$EMSDK_PYTHON" ]; then if [ -z "$EMSDK_PYTHON" ]; then
PYTHON3="$(dirname "$0")/python/3.13.3-0_64bit/bin/python3" PYTHON3="$(dirname "$0")/python/3.13.3_64bit/bin/python3"
if [ ! -f "$PYTHON3" ]; then if [ ! -f "$PYTHON3" ]; then
PYTHON3="$(dirname "$0")/python/3.9.2-1_64bit/bin/python3" PYTHON3="$(dirname "$0")/python/3.9.2_64bit/bin/python3"
fi fi
if [ -f "$PYTHON3" ]; then if [ -f "$PYTHON3" ]; then
EMSDK_PYTHON="$PYTHON3" EMSDK_PYTHON="$PYTHON3"

8
emsdk.bat
View File

@@ -8,15 +8,15 @@ setlocal
:: PYTHONHOME or PYTHONPATH :: PYTHONHOME or PYTHONPATH
:: https://github.com/emscripten-core/emsdk/issues/598 :: https://github.com/emscripten-core/emsdk/issues/598
if exist "%~dp0python\3.13.3-0_64bit\python.exe" ( if exist "%~dp0python\3.13.3_64bit\python.exe" (
set EMSDK_PY="%~dp0python\3.13.3-0_64bit\python.exe" set EMSDK_PY="%~dp0python\3.13.3_64bit\python.exe"
set PYTHONHOME= set PYTHONHOME=
set PYTHONPATH= set PYTHONPATH=
goto end goto end
) )
if exist "%~dp0python\3.9.2-1_64bit\python.exe" ( if exist "%~dp0python\3.9.2_64bit\python.exe" (
set EMSDK_PY="%~dp0python\3.9.2-1_64bit\python.exe" set EMSDK_PY="%~dp0python\3.9.2_64bit\python.exe"
set PYTHONHOME= set PYTHONHOME=
set PYTHONPATH= set PYTHONPATH=
goto end goto end