diff --git a/emsdk_manifest.json b/emsdk_manifest.json index e3db4d3..39218d5 100644 --- a/emsdk_manifest.json +++ b/emsdk_manifest.json @@ -306,23 +306,23 @@ }, { "id": "python", - "version": "3.5.4", + "version": "3.7.4", "bitness": 32, "arch": "x86", - "windows_url": "WinPython-32bit-3.5.4.1Zero.zip", - "activated_path": "%installation_dir%/python-3.5.4", - "activated_cfg": "PYTHON='%installation_dir%/python-3.5.4/python%.exe%'", - "activated_env": "EMSDK_PYTHON=%installation_dir%/python-3.5.4/python%.exe%" + "windows_url": "python-3.7.4-embed-win32-patched.zip", + "activated_path": "%installation_dir%", + "activated_cfg": "PYTHON='%installation_dir%/python.exe'", + "activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe" }, { "id": "python", - "version": "3.5.4", + "version": "3.7.4", "bitness": 64, "arch": "x86_64", - "windows_url": "WinPython-64bit-3.5.4.1Zero.zip", - "activated_path": "%installation_dir%/python-3.5.4.amd64", - "activated_cfg": "PYTHON='%installation_dir%/python-3.5.4.amd64/python%.exe%'", - "activated_env": "EMSDK_PYTHON=%installation_dir%/python-3.5.4.amd64/python%.exe%" + "windows_url": "python-3.7.4-embed-amd64-patched.zip", + "activated_path": "%installation_dir%", + "activated_cfg": "PYTHON='%installation_dir%/python.exe'", + "activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe" }, { "id": "java", @@ -514,7 +514,7 @@ { "version": "upstream-master", "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" }, { @@ -532,13 +532,13 @@ { "version": "fastcomp-master", "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" }, { "version": "fastcomp-master", "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" }, { @@ -702,7 +702,7 @@ { "version": "releases-upstream-%releases-tag%", "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", "custom_install_script": "emscripten_npm_install" }, @@ -723,7 +723,7 @@ { "version": "releases-fastcomp-%releases-tag%", "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", "custom_install_script": "emscripten_npm_install" }, diff --git a/test.bat b/test.bat index 9cc6094..9dd5332 100755 --- a/test.bat +++ b/test.bat @@ -3,4 +3,5 @@ set PATH=%PATH%;%PYTHON_BIN% @CALL emsdk install latest @CALL emsdk activate latest @CALL emsdk_env.bat --build=Release +@CALL python -c "import sys; print(sys.executable)" @CALL emcc.bat -v