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

Switch to python3 when installing python on windows installs. (#349)

Browse Source
This commit is contained in:
Sam Clegg
2020-02-04 17:03:20 -08:00
committed by GitHub
parent 801bef7d44
commit 573278be09
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
emsdk_manifest.json
View File

@@ -306,23 +306,23 @@
}, },
{ {
"id": "python", "id": "python",
"version": "3.5.4", "version": "3.7.4",
"bitness": 32, "bitness": 32,
"arch": "x86", "arch": "x86",
"windows_url": "WinPython-32bit-3.5.4.1Zero.zip", "windows_url": "python-3.7.4-embed-win32-patched.zip",
"activated_path": "%installation_dir%/python-3.5.4", "activated_path": "%installation_dir%",
"activated_cfg": "PYTHON='%installation_dir%/python-3.5.4/python%.exe%'", "activated_cfg": "PYTHON='%installation_dir%/python.exe'",
"activated_env": "EMSDK_PYTHON=%installation_dir%/python-3.5.4/python%.exe%" "activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe"
}, },
{ {
"id": "python", "id": "python",
"version": "3.5.4", "version": "3.7.4",
"bitness": 64, "bitness": 64,
"arch": "x86_64", "arch": "x86_64",
"windows_url": "WinPython-64bit-3.5.4.1Zero.zip", "windows_url": "python-3.7.4-embed-amd64-patched.zip",
"activated_path": "%installation_dir%/python-3.5.4.amd64", "activated_path": "%installation_dir%",
"activated_cfg": "PYTHON='%installation_dir%/python-3.5.4.amd64/python%.exe%'", "activated_cfg": "PYTHON='%installation_dir%/python.exe'",
"activated_env": "EMSDK_PYTHON=%installation_dir%/python-3.5.4.amd64/python%.exe%" "activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe"
}, },
{ {
"id": "java", "id": "java",
@@ -514,7 +514,7 @@
{ {
"version": "upstream-master", "version": "upstream-master",
"bitness": 64, "bitness": 64,
"uses": ["llvm-git-master-64bit", "node-12.9.1-64bit", "python-2.7.13.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"], "uses": ["llvm-git-master-64bit", "node-12.9.1-64bit", "python-3.7.4-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
"os": "win" "os": "win"
}, },
{ {
@@ -532,13 +532,13 @@
{ {
"version": "fastcomp-master", "version": "fastcomp-master",
"bitness": 32, "bitness": 32,
"uses": ["fastcomp-clang-master-32bit", "node-12.9.1-32bit", "python-2.7.13.1-32bit", "java-8.152-32bit", "emscripten-master-32bit", "binaryen-master-32bit"], "uses": ["fastcomp-clang-master-32bit", "node-12.9.1-32bit", "python-3.7.4-32bit", "java-8.152-32bit", "emscripten-master-32bit", "binaryen-master-32bit"],
"os": "win" "os": "win"
}, },
{ {
"version": "fastcomp-master", "version": "fastcomp-master",
"bitness": 64, "bitness": 64,
"uses": ["fastcomp-clang-master-64bit", "node-12.9.1-64bit", "python-2.7.13.1-64bit", "java-8.152-64bit", "emscripten-master-64bit", "binaryen-master-64bit"], "uses": ["fastcomp-clang-master-64bit", "node-12.9.1-64bit", "python-3.7.4-64bit", "java-8.152-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
"os": "win" "os": "win"
}, },
{ {
@@ -702,7 +702,7 @@
{ {
"version": "releases-upstream-%releases-tag%", "version": "releases-upstream-%releases-tag%",
"bitness": 64, "bitness": 64,
"uses": ["node-12.9.1-64bit", "python-2.7.13.1-64bit", "java-8.152-64bit", "releases-upstream-%releases-tag%-64bit"], "uses": ["node-12.9.1-64bit", "python-3.7.4-64bit", "java-8.152-64bit", "releases-upstream-%releases-tag%-64bit"],
"os": "win", "os": "win",
"custom_install_script": "emscripten_npm_install" "custom_install_script": "emscripten_npm_install"
}, },
@@ -723,7 +723,7 @@
{ {
"version": "releases-fastcomp-%releases-tag%", "version": "releases-fastcomp-%releases-tag%",
"bitness": 64, "bitness": 64,
"uses": ["node-12.9.1-64bit", "python-2.7.13.1-64bit", "java-8.152-64bit", "releases-fastcomp-%releases-tag%-64bit"], "uses": ["node-12.9.1-64bit", "python-3.7.4-64bit", "java-8.152-64bit", "releases-fastcomp-%releases-tag%-64bit"],
"os": "win", "os": "win",
"custom_install_script": "emscripten_npm_install" "custom_install_script": "emscripten_npm_install"
}, },

1
test.bat
View File

@@ -3,4 +3,5 @@ set PATH=%PATH%;%PYTHON_BIN%
@CALL emsdk install latest @CALL emsdk install latest
@CALL emsdk activate latest @CALL emsdk activate latest
@CALL emsdk_env.bat --build=Release @CALL emsdk_env.bat --build=Release
@CALL python -c "import sys; print(sys.executable)"
@CALL emcc.bat -v @CALL emcc.bat -v