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

Remove old Python versions from manifest: no package uses these python versions anymore. (#1465)

Browse Source
This commit is contained in:
juj
2024-10-17 19:47:11 +03:00
committed by GitHub
parent 8e661c80d4
commit 2c42698bcd
5 changed files with 2 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -65,7 +65,7 @@ https://emscripten.org/docs/building_from_source/toolchain_what_is_needed.html.
### Linux ### Linux
- `python`: Version 2.7.0 or above. - `python`: Version 3.9.2 or above.
- `java`: For running closure compiler (optional) - `java`: For running closure compiler (optional)
The emsdk pre-compiled binaries are built against Ubuntu/Focal 20.04 LTS and The emsdk pre-compiled binaries are built against Ubuntu/Focal 20.04 LTS and

3
emsdk
View File

@@ -9,9 +9,6 @@
# 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.9.2-1_64bit/bin/python3" PYTHON3="$(dirname "$0")/python/3.9.2-1_64bit/bin/python3"
if [ ! -f "$PYTHON3" ]; then
PYTHON3="$(dirname "$0")/python/3.7.4-2_64bit/bin/python3"
fi
if [ -f "$PYTHON3" ]; then if [ -f "$PYTHON3" ]; then
EMSDK_PYTHON="$PYTHON3" EMSDK_PYTHON="$PYTHON3"

21
emsdk.bat
View File

@@ -21,27 +21,6 @@ if exist "%~dp0python\3.9.2-nuget_64bit\python.exe" (
goto end goto end
) )
if exist "%~dp0python\3.7.4-pywin32_64bit\python.exe" (
set EMSDK_PY="%~dp0python\3.7.4-pywin32_64bit\python.exe"
set PYTHONHOME=
set PYTHONPATH=
goto end
)
if exist "%~dp0python\3.7.4_64bit\python.exe" (
set EMSDK_PY="%~dp0python\3.7.4_64bit\python.exe"
set PYTHONHOME=
set PYTHONPATH=
goto end
)
if exist "%~dp0python\2.7.13.1_64bit\python-2.7.13.amd64\python.exe" (
set EMSDK_PY="%~dp0python\2.7.13.1_64bit\python-2.7.13.amd64\python.exe"
set PYTHONHOME=
set PYTHONPATH=
goto end
)
:: As a last resort, access from PATH. :: As a last resort, access from PATH.
set EMSDK_PY=python set EMSDK_PY=python

10
emsdk.ps1
View File

@@ -2,15 +2,7 @@ $ScriptDirectory = Split-Path -parent $PSCommandPath
$PythonLocations = $( $PythonLocations = $(
"python\3.9.2-1_64bit\python.exe", "python\3.9.2-1_64bit\python.exe",
"python\3.9.2-nuget_64bit\python.exe", "python\3.9.2-nuget_64bit\python.exe"
"python\3.7.4-pywin32_64bit\python.exe",
"python\3.7.4_64bit\python.exe",
"python\2.7.13.1_64bit\python-2.7.13.amd64\python.exe",
"python\2.7.13.1_32bit\python-2.7.13\python.exe",
"python\2.7.5.3_64bit\python.exe",
"python\2.7.5.3_32bit\python.exe",
"python\2.7.5_64bit\python.exe",
"python\2.7.5.1_32bit\python.exe"
) )
# Find python from an explicit location relative to the Emscripten SDK. # Find python from an explicit location relative to the Emscripten SDK.

70
emsdk_manifest.json
View File

@@ -395,76 +395,6 @@
}, },
{
"id": "python",
"version": "2.7.13.1",
"bitness": 32,
"arch": "x86",
"windows_url": "WinPython-32bit-2.7.13.1Zero.zip",
"activated_cfg": "PYTHON='%installation_dir%/python-2.7.13/python%.exe%'",
"activated_env": "EMSDK_PYTHON=%installation_dir%/python-2.7.13/python%.exe%",
"is_old": true
},
{
"id": "python",
"version": "2.7.13.1",
"bitness": 64,
"arch": "x86_64",
"windows_url": "WinPython-64bit-2.7.13.1Zero.zip",
"activated_cfg": "PYTHON='%installation_dir%/python-2.7.13.amd64/python%.exe%'",
"activated_env": "EMSDK_PYTHON=%installation_dir%/python-2.7.13.amd64/python%.exe%",
"is_old": true
},
{
"id": "python",
"version": "3.7.4",
"bitness": 32,
"arch": "x86",
"windows_url": "python-3.7.4-embed-win32-patched.zip",
"activated_cfg": "PYTHON='%installation_dir%/python.exe'",
"activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe",
"is_old": true
},
{
"id": "python",
"version": "3.7.4",
"bitness": 64,
"arch": "x86_64",
"windows_url": "python-3.7.4-embed-amd64-patched.zip",
"activated_cfg": "PYTHON='%installation_dir%/python.exe'",
"activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe",
"is_old": true
},
{
"id": "python",
"version": "3.7.4-pywin32",
"bitness": 32,
"arch": "x86",
"windows_url": "python-3.7.4-embed-win32+pywin32.zip",
"activated_cfg": "PYTHON='%installation_dir%/python.exe'",
"activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe",
"is_old": true
},
{
"id": "python",
"version": "3.7.4-pywin32",
"bitness": 64,
"arch": "x86_64",
"windows_url": "python-3.7.4-embed-amd64+pywin32.zip",
"activated_cfg": "PYTHON='%installation_dir%/python.exe'",
"activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe",
"is_old": true
},
{
"id": "python",
"version": "3.7.4-2",
"bitness": 64,
"arch": "x86_64",
"macos_url": "python-3.7.4-2-macos.tar.gz",
"activated_cfg": "PYTHON='%installation_dir%/bin/python3'",
"activated_env": "EMSDK_PYTHON=%installation_dir%/bin/python3;SSL_CERT_FILE=%installation_dir%/lib/python3.7/site-packages/certifi/cacert.pem",
"is_old": true
},
{ {
"id": "python", "id": "python",
"version": "3.9.2-nuget", "version": "3.9.2-nuget",