From ab8503aa316ae0d221d0eb50b111bf9875726970 Mon Sep 17 00:00:00 2001
From: Fabio Alessandrelli <fabio.alessandrelli@gmail.com>
Date: Thu, 10 Dec 2020 10:06:36 +0100
Subject: [PATCH] JavaScript: Install Emscripten SDK 1.39.9 (Mono) and 2.0.10
 (Standard).

Mono needs to stay on 1.39.9 for compatibility with Mono 6.12.x, but for
standard builds the latest is best, and 2.0.10+ is needed for GDNative support.

None is sourced by default, they will be sourced by the build script.

We use a copy of the same Git clone to ensure that `emsdk_env.sh` is
compatible, otherwise we end up with a dirty state when sourcing both.
---
 Dockerfile.javascript | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile.javascript b/Dockerfile.javascript
index 19eb396..bf8b0f5 100644
--- a/Dockerfile.javascript
+++ b/Dockerfile.javascript
@@ -6,13 +6,13 @@ ARG mono_version
 RUN if [ -z "${mono_version}" ]; then printf "\n\nArgument mono_version is mandatory!\n\n"; exit 1; fi && \
     dnf -y install --setopt=install_weak_deps=False \
       java-openjdk && \
-    git clone --progress https://github.com/emscripten-core/emsdk && \
-    cd emsdk && \
-    git checkout 1.39.9 && \
-    ./emsdk install 1.39.9 && \
-    ./emsdk activate 1.39.9 && \
-    echo "source /root/emsdk/emsdk_env.sh" >> /root/.bashrc && \
-    source /root/emsdk/emsdk_env.sh && \
+    git clone --branch 2.0.10 --progress https://github.com/emscripten-core/emsdk emsdk_2.0.10 && \
+    cp -r emsdk_2.0.10 emsdk_1.39.9 && \
+    emsdk_2.0.10/emsdk install 2.0.10 && \
+    emsdk_2.0.10/emsdk activate 2.0.10 && \
+    emsdk_1.39.9/emsdk install 1.39.9 && \
+    emsdk_1.39.9/emsdk activate 1.39.9 && \
+    source /root/emsdk_1.39.9/emsdk_env.sh && \
     cp -a /root/files/${mono_version} /root && \
     cd /root/${mono_version} && \
     export MONO_SOURCE_ROOT=/root/${mono_version} && \