Update to WinPython 2.7.13.1 and add new packages for WinPython 3.5.4…

… as well. (only used if explicitly installed)
emscripten-core · Feb 26, 2018 · 4c8ea1b · 4c8ea1b
1 parent 14790ac
commit 4c8ea1b
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 19 deletions.
diff --git a/emsdk.bat b/emsdk.bat
@@ -1,4 +1,14 @@
 :: Find python from an explicit location relative to the Emscripten SDK.
+@IF EXIST "%~dp0python\2.7.13.1_64bit\python-2.7.13.amd64\python.exe" (
+  @SET EMSDK_PY="%~dp0python\2.7.13.1_64bit\python-2.7.13.amd64\python.exe"
+  @GOTO end
+)
+
+@IF EXIST "%~dp0python\2.7.13.1_32bit\python-2.7.13\python.exe" (
+  @SET EMSDK_PY="%~dp0python\2.7.13.1_32bit\python-2.7.13\python.exe"
+  @GOTO end
+)
+
 @IF EXIST "%~dp0python\2.7.5.3_64bit\python.exe" (
   @SET EMSDK_PY="%~dp0python\2.7.5.3_64bit\python.exe"
   @GOTO end

diff --git a/emsdk.ps1 b/emsdk.ps1
@@ -1,6 +1,8 @@
 $ScriptDirectory = Split-Path -parent $PSCommandPath
 
 $PythonLocations = $(
+    "python\2.7.13.1_64bit\python-2.7.13.amd64\python.exe",
+    "python\2.7.13.1_32bit\python-2.7.13\python.exe",
     "python\2.7.5.3_64bit\python.exe",
     "python\2.7.5.3_32bit\python.exe",
     "python\2.7.5_64bit\python.exe",

diff --git a/emsdk_manifest.json b/emsdk_manifest.json
@@ -405,15 +405,49 @@
     "bitness": 32,
     "windows_url": "python_2.7.5.3_32bit.zip",
     "activated_path": "%installation_dir%",
-    "activated_cfg": "PYTHON='%installation_dir%/python%.exe%'"
+    "activated_cfg": "PYTHON='%installation_dir%/python%.exe%'",
+    "is_old": true
   },
   {
     "id": "python",
     "version": "2.7.5.3",
     "bitness": 64,
     "windows_url": "python_2.7.5.3_64bit.zip",
     "activated_path": "%installation_dir%",
-    "activated_cfg": "PYTHON='%installation_dir%/python%.exe%'"
+    "activated_cfg": "PYTHON='%installation_dir%/python%.exe%'",
+    "is_old": true
+  },
+  {
+    "id": "python",
+    "version": "2.7.13.1",
+    "bitness": 32,
+    "windows_url": "WinPython-32bit-2.7.13.1Zero.zip",
+    "activated_path": "%installation_dir%/python-2.7.13",
+    "activated_cfg": "PYTHON='%installation_dir%/python-2.7.13/python%.exe%'"
+  },
+  {
+    "id": "python",
+    "version": "2.7.13.1",
+    "bitness": 64,
+    "windows_url": "WinPython-64bit-2.7.13.1Zero.zip",
+    "activated_path": "%installation_dir%/python-2.7.13.amd64",
+    "activated_cfg": "PYTHON='%installation_dir%/python-2.7.13.amd64/python%.exe%'"
+  },
+  {
+    "id": "python",
+    "version": "3.5.4",
+    "bitness": 32,
+    "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%'"
+  },
+  {
+    "id": "python",
+    "version": "3.5.4",
+    "bitness": 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%'"
   },
   {
     "id": "java",
@@ -948,13 +982,13 @@
   {
     "version": "incoming",
     "bitness": 32,
-    "uses": ["clang-incoming-32bit", "node-8.9.1-32bit", "python-2.7.5.3-32bit", "java-8.152-32bit", "emscripten-incoming-32bit"],
+    "uses": ["clang-incoming-32bit", "node-8.9.1-32bit", "python-2.7.13.1-32bit", "java-8.152-32bit", "emscripten-incoming-32bit"],
     "os": "win"
   },
   {
     "version": "incoming",
     "bitness": 64,
-    "uses": ["clang-incoming-64bit", "node-8.9.1-64bit", "python-2.7.5.3-64bit", "java-8.152-64bit", "emscripten-incoming-64bit"],
+    "uses": ["clang-incoming-64bit", "node-8.9.1-64bit", "python-2.7.13.1-64bit", "java-8.152-64bit", "emscripten-incoming-64bit"],
     "os": "win"
   },
   {
@@ -978,13 +1012,13 @@
   {
     "version": "master",
     "bitness": 32,
-    "uses": ["clang-master-32bit", "node-4.1.1-32bit", "python-2.7.5.3-32bit", "java-8.152-32bit", "emscripten-master-32bit"],
+    "uses": ["clang-master-32bit", "node-4.1.1-32bit", "python-2.7.13.1-32bit", "java-8.152-32bit", "emscripten-master-32bit"],
     "os": "win"
   },
   {
     "version": "master",
     "bitness": 64,
-    "uses": ["clang-master-64bit", "node-4.1.1-64bit", "python-2.7.5.3-64bit", "java-8.152-64bit", "emscripten-master-64bit"],
+    "uses": ["clang-master-64bit", "node-4.1.1-64bit", "python-2.7.13.1-64bit", "java-8.152-64bit", "emscripten-master-64bit"],
     "os": "win"
   },
   {
@@ -1008,7 +1042,7 @@
   {
     "version": "tag-%tag%",
     "bitness": 32,
-    "uses": ["clang-tag-e%tag%-32bit", "node-4.1.1-32bit", "python-2.7.5.3-32bit", "java-7.45-32bit", "emscripten-tag-%tag%-32bit"],
+    "uses": ["clang-tag-e%tag%-32bit", "node-4.1.1-32bit", "python-2.7.13.1-32bit", "java-7.45-32bit", "emscripten-tag-%tag%-32bit"],
     "os": "win",
     "version_filter": [
       ["%tag%", "<=", "1.37.22"]
@@ -1017,7 +1051,7 @@
   {
     "version": "tag-%tag%",
     "bitness": 64,
-    "uses": ["clang-tag-e%tag%-64bit", "node-4.1.1-64bit", "python-2.7.5.3-64bit", "java-7.45-64bit", "emscripten-tag-%tag%-64bit"],
+    "uses": ["clang-tag-e%tag%-64bit", "node-4.1.1-64bit", "python-2.7.13.1-64bit", "java-7.45-64bit", "emscripten-tag-%tag%-64bit"],
     "os": "win",
     "version_filter": [
       ["%tag%", "<=", "1.37.22"]
@@ -1044,7 +1078,7 @@
   {
     "version": "tag-%tag%",
     "bitness": 32,
-    "uses": ["clang-tag-e%tag%-32bit", "node-8.9.1-32bit", "python-2.7.5.3-32bit", "java-8.152-32bit", "emscripten-tag-%tag%-32bit"],
+    "uses": ["clang-tag-e%tag%-32bit", "node-8.9.1-32bit", "python-2.7.13.1-32bit", "java-8.152-32bit", "emscripten-tag-%tag%-32bit"],
     "os": "win",
     "version_filter": [
       ["%tag%", ">", "1.37.22"]
@@ -1053,7 +1087,7 @@
   {
     "version": "tag-%tag%",
     "bitness": 64,
-    "uses": ["clang-tag-e%tag%-64bit", "node-8.9.1-64bit", "python-2.7.5.3-64bit", "java-8.152-64bit", "emscripten-tag-%tag%-64bit"],
+    "uses": ["clang-tag-e%tag%-64bit", "node-8.9.1-64bit", "python-2.7.13.1-64bit", "java-8.152-64bit", "emscripten-tag-%tag%-64bit"],
     "os": "win",
     "version_filter": [
       ["%tag%", ">", "1.37.22"]
@@ -1080,7 +1114,7 @@
   {
     "version": "nightly-%nightly-llvm-32bit%",
     "bitness": 32,
-    "uses": ["clang-nightly-e%nightly-llvm-32bit%-32bit", "node-4.1.1-32bit", "python-2.7.5.3-32bit", "java-7.45-32bit", "emscripten-nightly-%nightly-llvm-32bit%"],
+    "uses": ["clang-nightly-e%nightly-llvm-32bit%-32bit", "node-4.1.1-32bit", "python-2.7.13.1-32bit", "java-7.45-32bit", "emscripten-nightly-%nightly-llvm-32bit%"],
     "os": "win",
     "version_filter": [
       ["%nightly-llvm-32bit%", "<=", "1.37.22-2017_11_05"]
@@ -1089,7 +1123,7 @@
   {
     "version": "nightly-%nightly-llvm-64bit%",
     "bitness": 64,
-    "uses": ["clang-nightly-e%nightly-llvm-64bit%-64bit", "node-4.1.1-64bit", "python-2.7.5.3-64bit", "java-7.45-64bit", "emscripten-nightly-%nightly-llvm-64bit%"],
+    "uses": ["clang-nightly-e%nightly-llvm-64bit%-64bit", "node-4.1.1-64bit", "python-2.7.13.1-64bit", "java-7.45-64bit", "emscripten-nightly-%nightly-llvm-64bit%"],
     "os": "win",
     "version_filter": [
       ["%nightly-llvm-64bit%", "<=", "1.37.22-2017_11_05"]
@@ -1098,7 +1132,7 @@
   {
     "version": "nightly-%nightly-llvm-32bit%",
     "bitness": 32,
-    "uses": ["clang-nightly-e%nightly-llvm-32bit%-32bit", "node-4.1.1-32bit", "python-2.7.5.3-32bit", "java-8.152-32bit", "emscripten-nightly-%nightly-llvm-32bit%"],
+    "uses": ["clang-nightly-e%nightly-llvm-32bit%-32bit", "node-4.1.1-32bit", "python-2.7.13.1-32bit", "java-8.152-32bit", "emscripten-nightly-%nightly-llvm-32bit%"],
     "os": "win",
     "version_filter": [
       ["%nightly-llvm-32bit%", ">", "1.37.22-2017_11_05"]
@@ -1107,7 +1141,7 @@
   {
     "version": "nightly-%nightly-llvm-64bit%",
     "bitness": 64,
-    "uses": ["clang-nightly-e%nightly-llvm-64bit%-64bit", "node-4.1.1-64bit", "python-2.7.5.3-64bit", "java-8.152-64bit", "emscripten-nightly-%nightly-llvm-64bit%"],
+    "uses": ["clang-nightly-e%nightly-llvm-64bit%-64bit", "node-4.1.1-64bit", "python-2.7.13.1-64bit", "java-8.152-64bit", "emscripten-nightly-%nightly-llvm-64bit%"],
     "os": "win",
     "version_filter": [
       ["%nightly-llvm-64bit%", ">", "1.37.22-2017_11_05"]
@@ -1423,13 +1457,13 @@
   {
     "version": "1.37.1",
     "bitness": 64,
-    "uses": ["clang-e1.37.1-64bit", "node-4.1.1-64bit", "python-2.7.5.3-64bit", "emscripten-1.37.1"],
+    "uses": ["clang-e1.37.1-64bit", "node-4.1.1-64bit", "python-2.7.13.1-64bit", "emscripten-1.37.1"],
     "os": "win"
   },
   {
     "version": "%precompiled_tag32%",
     "bitness": 32,
-    "uses": ["clang-e%precompiled_tag32%-32bit", "node-4.1.1-32bit", "python-2.7.5.3-32bit", "java-7.45-32bit", "emscripten-%precompiled_tag32%"],
+    "uses": ["clang-e%precompiled_tag32%-32bit", "node-4.1.1-32bit", "python-2.7.13.1-32bit", "java-7.45-32bit", "emscripten-%precompiled_tag32%"],
     "os": "win",
     "version_filter": [
       ["%precompiled_tag32%", "<=", "1.37.22"]
@@ -1438,7 +1472,7 @@
   {
     "version": "%precompiled_tag64%",
     "bitness": 64,
-    "uses": ["clang-e%precompiled_tag64%-64bit", "node-4.1.1-64bit", "python-2.7.5.3-64bit", "java-7.45-64bit", "emscripten-%precompiled_tag64%"],
+    "uses": ["clang-e%precompiled_tag64%-64bit", "node-4.1.1-64bit", "python-2.7.13.1-64bit", "java-7.45-64bit", "emscripten-%precompiled_tag64%"],
     "os": "win",
     "version_filter": [
       ["%precompiled_tag64%", "<=", "1.37.22"]
@@ -1483,7 +1517,7 @@
   {
     "version": "%precompiled_tag32%",
     "bitness": 32,
-    "uses": ["clang-e%precompiled_tag32%-32bit", "node-8.9.1-32bit", "python-2.7.5.3-32bit", "java-8.152-32bit", "emscripten-%precompiled_tag32%"],
+    "uses": ["clang-e%precompiled_tag32%-32bit", "node-8.9.1-32bit", "python-2.7.13.1-32bit", "java-8.152-32bit", "emscripten-%precompiled_tag32%"],
     "os": "win",
     "version_filter": [
       ["%precompiled_tag32%", ">", "1.37.22"]
@@ -1492,7 +1526,7 @@
   {
     "version": "%precompiled_tag64%",
     "bitness": 64,
-    "uses": ["clang-e%precompiled_tag64%-64bit", "node-8.9.1-64bit", "python-2.7.5.3-64bit", "java-8.152-64bit", "emscripten-%precompiled_tag64%"],
+    "uses": ["clang-e%precompiled_tag64%-64bit", "node-8.9.1-64bit", "python-2.7.13.1-64bit", "java-8.152-64bit", "emscripten-%precompiled_tag64%"],
     "os": "win",
     "version_filter": [
       ["%precompiled_tag64%", ">", "1.37.22"]