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

Use bundled/embedded python3 binary on OSX (#561)

Browse Source 
See https://github.com/emscripten-core/emscripten/issues/7198
This commit is contained in:
Sam Clegg
2020-07-21 10:21:02 -07:00
committed by GitHub
parent d8984b2a9d
commit 4aa028017c
5 changed files with 78 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
emsdk_manifest.json
View File

@@ -288,6 +288,16 @@
"activated_cfg": "PYTHON='%installation_dir%/python.exe'",
"activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe"
},
{
"id": "python",
"version": "3.7.4",
"bitness": 64,
"arch": "x86_64",
"osx_url": "python-3.7.4-macos.tar.gz",
"activated_path": "%installation_dir%/bin",
"activated_cfg": "PYTHON='%installation_dir%/bin/python3'",
"activated_env": "EMSDK_PYTHON=%installation_dir%/bin/python3"
},
{
"id": "java",
"version": "8.152",
@@ -475,7 +485,7 @@
{
"version": "upstream-master",
"bitness": 64,
"uses": ["llvm-git-master-64bit", "node-12.18.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
"uses": ["llvm-git-master-64bit", "node-12.18.1-64bit", "python-3.7.4-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
"os": "osx"
},
{
@@ -505,7 +515,7 @@
{
"version": "fastcomp-master",
"bitness": 64,
"uses": ["fastcomp-clang-master-64bit", "node-12.18.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
"uses": ["fastcomp-clang-master-64bit", "node-12.18.1-64bit", "python-3.7.4-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
"os": "osx"
},
{
@@ -566,7 +576,7 @@
{
"version": "releases-upstream-%releases-tag%",
"bitness": 64,
"uses": ["node-12.18.1-64bit", "releases-upstream-%releases-tag%-64bit"],
"uses": ["node-12.18.1-64bit", "python-3.7.4-64bit", "releases-upstream-%releases-tag%-64bit"],
"os": "osx",
"custom_install_script": "emscripten_npm_install"
},
@@ -587,7 +597,7 @@
{
"version": "releases-fastcomp-%releases-tag%",
"bitness": 64,
"uses": ["node-12.18.1-64bit", "releases-fastcomp-%releases-tag%-64bit"],
"uses": ["node-12.18.1-64bit", "python-3.7.4-64bit", "releases-fastcomp-%releases-tag%-64bit"],
"os": "osx",
"custom_install_script": "emscripten_npm_install"
},
@@ -637,7 +647,7 @@
{
"version": "fastcomp-%precompiled_tag32%",
"bitness": 32,
"uses": ["fastcomp-clang-e%precompiled_tag32%-32bit", "node-8.9.1-32bit", "emscripten-%precompiled_tag32%"],
"uses": ["fastcomp-clang-e%precompiled_tag32%-32bit", "node-8.9.1-32bit", "python-3.7.4-64bit", "emscripten-%precompiled_tag32%"],
"os": "osx",
"version_filter": [
["%precompiled_tag32%", ">", "1.37.22"]
@@ -646,7 +656,7 @@
{
"version": "fastcomp-%precompiled_tag64%",
"bitness": 64,
"uses": ["fastcomp-clang-e%precompiled_tag64%-64bit", "node-8.9.1-64bit", "emscripten-%precompiled_tag64%"],
"uses": ["fastcomp-clang-e%precompiled_tag64%-64bit", "node-8.9.1-64bit", "python-3.7.4-64bit", "emscripten-%precompiled_tag64%"],
"os": "osx",
"version_filter": [
["%precompiled_tag64%", ">", "1.37.22"]