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

Add package for new Portable Git version 1.9.4 to the manifest. Adjust git usage by emsdk to never install git automatically, and prefer using system-provided git if it exists. Improve instructions to guide the user to manually installing git if not found. Fixes #13.

Browse Source
This commit is contained in:
Jukka Jylänki
2014-09-07 05:43:14 -04:00
parent 2a6fafec92
commit e26c839e82
2 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
emsdk_manifest.json
View File

@@ -262,6 +262,14 @@
"version": "1.8.3",
"windows_url": "git_1.8.3.zip",
"activated_path": "%installation_dir%/bin;%installation_dir%/cmd",
"activated_cfg": "EMSDK_GIT='%installation_dir%'",
"is_old": true
},
{
"id": "git",
"version": "1.9.4",
"windows_url": "git_1.9.4.zip",
"activated_path": "%installation_dir%/bin;%installation_dir%/cmd",
"activated_cfg": "EMSDK_GIT='%installation_dir%'"
},
{
@@ -462,13 +470,13 @@
{
"version": "incoming",
"bitness": 32,
"uses": ["git-1.8.3", "clang-incoming-32bit", "node-0.10.17-32bit", "python-2.7.5.3-32bit", "java-7.45-32bit", "emscripten-incoming"],
"uses": ["clang-incoming-32bit", "node-0.10.17-32bit", "python-2.7.5.3-32bit", "java-7.45-32bit", "emscripten-incoming"],
"os": "win"
},
{
"version": "incoming",
"bitness": 64,
"uses": ["git-1.8.3", "clang-incoming-64bit", "node-0.10.17-64bit", "python-2.7.5.3-64bit", "java-7.45-64bit", "emscripten-incoming"],
"uses": ["clang-incoming-64bit", "node-0.10.17-64bit", "python-2.7.5.3-64bit", "java-7.45-64bit", "emscripten-incoming"],
"os": "win"
},
{
@@ -492,13 +500,13 @@
{
"version": "master",
"bitness": 32,
"uses": ["git-1.8.3", "clang-master-32bit", "node-0.10.17-32bit", "python-2.7.5.3-32bit", "java-7.45-32bit", "emscripten-master"],
"uses": ["clang-master-32bit", "node-0.10.17-32bit", "python-2.7.5.3-32bit", "java-7.45-32bit", "emscripten-master"],
"os": "win"
},
{
"version": "master",
"bitness": 64,
"uses": ["git-1.8.3", "clang-master-64bit", "node-0.10.17-64bit", "python-2.7.5.3-64bit", "java-7.45-64bit", "emscripten-master"],
"uses": ["clang-master-64bit", "node-0.10.17-64bit", "python-2.7.5.3-64bit", "java-7.45-64bit", "emscripten-master"],
"os": "win"
},
{