From 0490c5f7aaf0e61aafd3b4cfe22cc56b803026b1 Mon Sep 17 00:00:00 2001
From: Alon Zakai <azakai@google.com>
Date: Wed, 29 May 2019 14:14:42 -0700
Subject: [PATCH] Support getting specific releases from emscripten-releases,
 by their version (#251)

This makes

emsdk install 1.38.33

work (1.38.33 is from the new builders).

Also works with the old notation, sdk-1.38.33-64bit, and also supports -(upstream|fastcomp).
---
 Dockerfile | 11 +++++++++++
 emsdk      | 28 ++++++++++++++++++++++++----
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6121b41..306e269 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,5 +37,16 @@ RUN cd /root/ \
  && /root/emsdk/emsdk activate tot-fastcomp \
  && source /root/emsdk/emsdk_env.sh --build=Release \
  && emcc hello_world.cpp \
+ && echo "test specific release (old)" \
+ && /root/emsdk/emsdk install sdk-1.38.31-64bit \
+ && /root/emsdk/emsdk activate tot-fastcomp \
+ && echo "test specific release (new, short name)" \
+ && /root/emsdk/emsdk install 1.38.33 \
+ && /root/emsdk/emsdk activate tot-fastcomp \
+ && python -c "import os ; assert 'fastcomp' in open(os.path.expanduser('~/.emscripten')).read()" \
+ && python -c "import os ; assert 'upstream' not in open(os.path.expanduser('~/.emscripten')).read()" \
+ && echo "test specific release (new, full name)" \
+ && /root/emsdk/emsdk install sdk-1.38.33-upstream-64bit \
+ && /root/emsdk/emsdk activate sdk-1.38.33-upstream-64bit \
  && echo "test binaryen source build" \
  && /root/emsdk/emsdk install --build=Release binaryen-master-64bit
diff --git a/emsdk b/emsdk
index 7bc10cd..fa7bede 100755
--- a/emsdk
+++ b/emsdk
@@ -2423,17 +2423,37 @@ def main():
         return 1
   sys.argv = [x for x in sys.argv if not len(x) == 0]
 
+  releases_info = load_releases_info()['releases']
+
   # Replace meta-packages with the real package names.
   if cmd in ('update', 'install', 'activate'):
     for i in range(2, len(sys.argv)):
-      if sys.argv[i] in ('latest', 'sdk-latest', 'latest-64bit', 'sdk-latest-64bit', 'latest-fastcomp', 'latest-releases-fastcomp'):
+      arg = sys.argv[i]
+      if arg in ('latest', 'sdk-latest', 'latest-64bit', 'sdk-latest-64bit', 'latest-fastcomp', 'latest-releases-fastcomp'):
         sys.argv[i] = str(find_latest_releases_sdk('fastcomp'))
-      elif sys.argv[i] in ('latest-upstream', 'latest-clang-upstream', 'latest-releases-upstream'):
+      elif arg in ('latest-upstream', 'latest-clang-upstream', 'latest-releases-upstream'):
         sys.argv[i] = str(find_latest_releases_sdk('upstream'))
-      elif sys.argv[i] == 'tot-upstream':
+      elif arg == 'tot-upstream':
         sys.argv[i] = str(find_tot_sdk('upstream'))
-      elif sys.argv[i] in ('tot-fastcomp', 'sdk-nightly-latest'):
+      elif arg in ('tot-fastcomp', 'sdk-nightly-latest'):
         sys.argv[i] = str(find_tot_sdk('fastcomp'))
+      else:
+        # check if it's a release handled by an emscripten-releases version,
+        # and if so use that by using the right hash. we support a few notations,
+        #   x.y.z[-(upstream|fastcomp_])
+        #   sdk-x.y.z[-(upstream|fastcomp_])-64bit
+        # TODO: support short notation for old builds too?
+        upstream = False
+        if '-upstream' in arg:
+          arg = arg.replace('-upstream', '')
+          upstream = True
+        elif '-fastcomp' in arg:
+          arg = arg.replace('-fastcomp', '')
+          upstream = False
+        arg = arg.replace('sdk-', '').replace('-64bit', '')
+        release_hash = releases_info.get(arg, None) or releases_info.get('sdk-' + arg + '-64bit')
+        if release_hash:
+          sys.argv[i] = 'sdk-releases-%s-%s-64bit' % ('upstream' if upstream else 'fastcomp', release_hash)
 
   if cmd == 'list':
     print('')