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

Switch to nuget python package for windows (#1001)

Browse Source 
This allows us to use pip and install other packages.

Fixes #16466
This commit is contained in:
Sam Clegg
2022-03-21 16:16:44 +00:00
committed by GitHub
parent 433a2d1bc0
commit 70323522d6
2 changed files with 42 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
emsdk_manifest.json
View File

@@ -420,6 +420,15 @@
"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",
"version": "3.9.2-nuget",
"bitness": 64,
"arch": "x86_64",
"windows_url": "python-3.9.2-4-amd64+pywin32.zip",
"activated_cfg": "PYTHON='%installation_dir%/python.exe'",
"activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe"
},
{
"id": "python",
"version": "3.9.2",
@@ -644,7 +653,7 @@
{
"version": "upstream-main",
"bitness": 64,
"uses": ["python-3.9.2-64bit", "llvm-git-main-64bit", "node-14.18.2-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
"uses": ["python-3.9.2-nuget-64bit", "llvm-git-main-64bit", "node-14.18.2-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
"os": "win"
},
{
@@ -727,7 +736,7 @@
{
"version": "releases-upstream-%releases-tag%",
"bitness": 64,
"uses": ["node-14.18.2-64bit", "python-3.9.2-64bit", "java-8.152-64bit", "releases-upstream-%releases-tag%-64bit"],
"uses": ["node-14.18.2-64bit", "python-3.9.2-nuget-64bit", "java-8.152-64bit", "releases-upstream-%releases-tag%-64bit"],
"os": "win",
"custom_install_script": "emscripten_npm_install"
},