From b99936044fecefa0d3ab824ff1b7515116170136 Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Sun, 8 Aug 2021 18:11:46 +0200
Subject: [PATCH] Added the run command to the build config so for example
 emsdk_env can be sourced automatically before a build when needed, as now
 godot's build script works differently.

---
 SConstruct           | 44 +++++++++++++++++++++++++++++++++++++-------
 build.config.example |  7 +++++--
 2 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/SConstruct b/SConstruct
index f6cc2772..4fe9fd31 100644
--- a/SConstruct
+++ b/SConstruct
@@ -46,6 +46,14 @@ exports = {
     'javascript': [],
 }
 
+additional_commands = {
+    'global': [],
+    'linux': [],
+    'windows': [],
+    'android': [],
+    'javascript': [],
+}
+
 engine_repository = [ ['https://github.com/godotengine/godot.git', 'git@github.com:godotengine/godot.git'], 'engine', '' ]
 
 module_repositories = [
@@ -276,6 +284,20 @@ def get_exports_for(platform):
 
     return command
 
+def get_additional_commands_for(platform):
+    command_separator = ';'
+
+    if 'win' in sys.platform:
+        command_separator = '&'
+
+    command = ''
+
+    for p in additional_commands[platform]:
+        command += p + command_separator
+
+    return command
+
+
 
 def parse_config():
     global visual_studio_vcvarsall_path
@@ -313,6 +335,14 @@ def parse_config():
                 export_path = format_path(ls[8 + len(words[1]):])
 
                 exports[words[1]].append(export_path)
+            elif words[0] == 'run':
+                if (len(words) < 3) or not words[1] in additional_commands:
+                    print('This build.config line is malformed, and got ignored: ' + ls)
+                    continue
+
+                final_cmd = format_path(ls[5 + len(words[1]):])
+
+                additional_commands[words[1]].append(final_cmd)
 
 parse_config()
 
@@ -327,7 +357,7 @@ if len(sys.argv) > 1:
     arg_split = arg_split[1:]
 
     if arg[0] == 'b':
-        build_string = get_exports_for('global') + 'scons '
+        build_string = get_exports_for('global') + get_additional_commands_for('global') + 'scons '
 
         build_string += 'tools='
         if 'e' in arg:
@@ -404,7 +434,7 @@ if len(sys.argv) > 1:
         if 'l' in arg:
             build_string += 'platform=x11'
 
-            build_string = get_exports_for('linux') + build_string + target
+            build_string = get_exports_for('linux') + get_additional_commands_for('linux') + build_string + target
 
             print('Running command: ' + build_string)
 
@@ -412,7 +442,7 @@ if len(sys.argv) > 1:
         elif 'w' in arg:
             build_string += 'platform=windows'
 
-            build_string = get_exports_for('windows') + build_string
+            build_string = get_exports_for('windows') + get_additional_commands_for('windows') + build_string
 
             print('Running command: ' + build_string)
 
@@ -420,7 +450,7 @@ if len(sys.argv) > 1:
         elif 'a' in arg:
             build_string += 'platform=android'
 
-            build_string = get_exports_for('android') + build_string
+            build_string = get_exports_for('android') + get_additional_commands_for('android') + build_string
 
             print('Running command: ' + build_string + ' android_arch=armv7')
             subprocess.call(build_string + ' android_arch=armv7', shell=True)
@@ -431,12 +461,12 @@ if len(sys.argv) > 1:
 
             os.chdir(full_path + 'platform/android/java/')
 
-            print('Running command: ' + get_exports_for('global') + get_exports_for('android') + './gradlew generateGodotTemplates')
-            subprocess.call(get_exports_for('global') + get_exports_for('android') + './gradlew generateGodotTemplates', shell=True)
+            print('Running command: ' + get_exports_for('global') + get_additional_commands_for('global') + get_exports_for('android') + get_additional_commands_for('android') + './gradlew generateGodotTemplates')
+            subprocess.call(get_exports_for('global') + get_additional_commands_for('global') + get_exports_for('android') + get_additional_commands_for('android') + './gradlew generateGodotTemplates', shell=True)
         elif 'j' in arg:
             build_string += 'platform=javascript'
 
-            build_string = get_exports_for('javascript') + build_string
+            build_string = get_exports_for('javascript') + get_additional_commands_for('javascript') + build_string
 
             print('Running command: ' + build_string)
             subprocess.call(build_string, shell=True)
diff --git a/build.config.example b/build.config.example
index 5ac8afba..f127b866 100644
--- a/build.config.example
+++ b/build.config.example
@@ -32,8 +32,10 @@ visual_studio_call_vcvarsall True
 visual_studio_vcvarsall_path C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Auxiliary/Build/vcvarsall.bat
 visual_studio_arch amd64
 
-# export related setup
-# available export targets: global, linux, windows, android, javascript
+# You can export variables with the export keyword
+# You can run commands with the run keywords
+# <export/run> <target platform> <exported variable/command>
+# available export/run targets: global, linux, windows, android, javascript
 
 export global SCONS_CACHE=~/.scons_cache
 export global SCONS_CACHE_LIMIT=5000
@@ -42,3 +44,4 @@ export android ANDROID_NDK_ROOT=~/SDKs/Android/NDK/android-ndk-r20b
 export android ANDROID_NDK_HOME=~/SDKs/Android/NDK/android-ndk-r20b
 export android ANDROID_HOME=~/SDKs/Android/SDK
 
+run javascript source ~/SDKs/emsdk/emsdk_env.sh