In-container build script cleanups.

misc/build-containers/engine_build_scripts/android.sh

@@ -2,10 +2,10 @@
 set -e
 
 # Android editor
-scons production=yes tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=android android_arch=armv7 "$@" . 2>&1 | tee logs/android_editor_armv7.log
-scons production=yes tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=android android_arch=arm64v8 "$@" . 2>&1 | tee logs/android_editor_arm64v8.log
-scons production=yes tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=android android_arch=x86 "$@" . 2>&1 | tee logs/android_editor_x86.log
-scons production=yes tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=android android_arch=x86_64 "$@" . 2>&1 | tee logs/android_editor_x86_64.log
+scons production=yes tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=android android_arch=armv7 "$@"
+scons production=yes tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=android android_arch=arm64v8 "$@" 
+scons production=yes tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=android android_arch=x86 "$@"
+scons production=yes tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=android android_arch=x86_64 "$@"
 
 pushd platform/android/java/
 
@@ -14,10 +14,10 @@ pushd platform/android/java/
 popd
 
 # Android templates release_debug
-scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=android android_arch=armv7 "$@" . 2>&1 | tee logs/android_template_rd_armv7.log
-scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=android android_arch=arm64v8 "$@" . 2>&1 | tee logs/android_template_rd_arm64v8.log
-scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=android android_arch=x86 "$@" . 2>&1 | tee logs/android_template_rd_x86.log
-scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=android android_arch=x86_64 "$@" . 2>&1 | tee logs/android_template_rd_x86_64.log
+scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=android android_arch=armv7 "$@"
+scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=android android_arch=arm64v8 "$@"
+scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=android android_arch=x86 "$@"
+scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=android android_arch=x86_64 "$@"
 
 pushd platform/android/java/
 
@@ -26,10 +26,10 @@ pushd platform/android/java/
 popd
 
 # Android templates release
-scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=android android_arch=armv7 "$@" . 2>&1 | tee logs/android_template_r_armv7.log
-scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=android android_arch=arm64v8 "$@" . 2>&1 | tee logs/android_template_r_arm64v8.log
-scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=android android_arch=x86 "$@" . 2>&1 | tee logs/android_template_r_x86.log
-scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=android android_arch=x86_64 "$@" . 2>&1 | tee logs/android_template_r_x86_64.log
+scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=android android_arch=armv7 "$@"
+scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=android android_arch=arm64v8 "$@"
+scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=android android_arch=x86 "$@"
+scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=android android_arch=x86_64 "$@"
 
 pushd platform/android/java/
 

misc/build-containers/engine_build_scripts/javascript.sh

@@ -5,22 +5,22 @@ source /root/emsdk/emsdk_env.sh
 
 
 # Javascript editor
-scons tools=yes target=release_debug custom_modules_shared=no debug_symbols=no threads_enabled=yes platform=javascript "$@" . 2>&1 | tee logs/javascript_ed.log
+scons tools=yes target=release_debug custom_modules_shared=no debug_symbols=no threads_enabled=yes platform=javascript "$@"
 
 # Javascript templates normal
-scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=javascript "$@" . 2>&1 | tee logs/javascript_rd.log
+scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=javascript "$@"
 
-scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=javascript "$@" . 2>&1 | tee logs/javascript_r.log
+scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=javascript "$@"
 
 # TODO lto (production=yes) doesn't seem to work for now with thread builds
 
 # Javascript templates threads
-scons tools=no target=release_debug custom_modules_shared=no debug_symbols=no threads_enabled=yes platform=javascript "$@" . 2>&1 | tee logs/javascript_rd_threads.log
+scons tools=no target=release_debug custom_modules_shared=no debug_symbols=no threads_enabled=yes platform=javascript "$@"
 
-scons tools=no target=release custom_modules_shared=no debug_symbols=no threads_enabled=yes platform=javascript "$@" . 2>&1 | tee logs/javascript_r_threads.log
+scons tools=no target=release custom_modules_shared=no debug_symbols=no threads_enabled=yes platform=javascript "$@"
 
 # Javascript templates gdnative
-scons tools=no target=release_debug custom_modules_shared=no debug_symbols=no gdnative_enabled=yes platform=javascript "$@" . 2>&1 | tee logs/javascript_rd_gdnative.log
+scons tools=no target=release_debug custom_modules_shared=no debug_symbols=no gdnative_enabled=yes platform=javascript "$@"
 
-scons tools=no target=release custom_modules_shared=no debug_symbols=no gdnative_enabled=yes platform=javascript "$@" . 2>&1 | tee logs/javascript_r_gdnative.log
+scons tools=no target=release custom_modules_shared=no debug_symbols=no gdnative_enabled=yes platform=javascript "$@"
 

misc/build-containers/engine_build_scripts/linux.sh

@@ -13,43 +13,43 @@ export PATH="${GODOT_SDK_LINUX_X86_64}/bin:${BASE_PATH}"
 #mv -f bin/pandemonium.x11.opt.tools.armv7 bin/pandemonium.x11.opt.tools.pi4
 
 # Linux editor 64 bit
-scons production=yes tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 bits=64 "$@" . 2>&1 | tee logs/linux_ed_64.log
+scons production=yes tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 bits=64 "$@"
 
 # Linux templates 64 bit
-scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 bits=64 "$@" . 2>&1 | tee logs/linux_template_rd_64.log
-scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=x11 bits=64 "$@" . 2>&1 | tee logs/linux_template_r_64.log
+scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 bits=64 "$@"
+scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=x11 bits=64 "$@"
 
 # Linux headless (editor) 64bit
-scons production=yes tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=server bits=64 "$@" . 2>&1 | tee logs/headless.log
+scons production=yes tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=server bits=64 "$@"
 
 # Linux server (templates) 64bit
-scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=server bits=64 "$@" . 2>&1 | tee logs/server_rd.log
-scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=server bits=64 "$@" . 2>&1 | tee logs/server_d.log
+scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=server bits=64 "$@"
+scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=server bits=64 "$@"
 
 export PATH="${GODOT_SDK_LINUX_X86_32}/bin:${BASE_PATH}"
 
 # Linux editor 32 bit
-scons production=yes tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 bits=32 "$@" . 2>&1 | tee logs/linux_ed_32.log
+scons production=yes tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 bits=32 "$@"
 
 # Linux templates 32 bit
-scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 bits=32 "$@" . 2>&1 | tee logs/linux_template_rd_32.log
-scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=x11 bits=32 "$@" . 2>&1 | tee logs/linux_template_r_32.log
+scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 bits=32 "$@"
+scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=x11 bits=32 "$@"
 
 export PATH="${GODOT_SDK_LINUX_ARM64}/bin:${BASE_PATH}"
 
 # Linux editor arm64
-scons production=yes tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 arch=arm64 "$@" . 2>&1 | tee logs/linux_ed_arm64.log
+scons production=yes tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 arch=arm64 "$@"
 
 # Linux templates arm64
-scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 arch=arm64 "$@" . 2>&1 | tee logs/linux_template_rd_arm64.log
-scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=x11 arch=arm64 "$@" . 2>&1 | tee logs/linux_template_r_arm64.log
+scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 arch=arm64 "$@"
+scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=x11 arch=arm64 "$@"
 
 export PATH="${GODOT_SDK_LINUX_ARM32}/bin:${BASE_PATH}"
 
 # Linux editor arm
-scons production=yes tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 arch=arm "$@" . 2>&1 | tee logs/linux_ed_arm.log
+scons production=yes tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 arch=arm "$@"
 
 # Linux templates arm
-scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 arch=arm "$@" . 2>&1 | tee logs/linux_template_rd_arm.log
-scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=x11 arch=arm "$@" . 2>&1 | tee logs/linux_template_r_arm.log
+scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 arch=arm "$@"
+scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=x11 arch=arm "$@"
 

misc/build-containers/engine_build_scripts/windows.sh

@@ -3,16 +3,16 @@ set -e
 
 
 # Windows editor (release debug) 64 bit
-scons production=yes tools=yes target=release_debug debug_symbols=no platform=windows bits=64 "$@" . 2>&1 | tee logs/windows_ed_64.log
+scons production=yes tools=yes target=release_debug debug_symbols=no platform=windows bits=64 "$@"
 
 # Windows editor (release debug) 32 bit
-scons production=yes tools=yes target=release_debug debug_symbols=no platform=windows bits=32 "$@" . 2>&1 | tee logs/windows_ed_32.log
+scons production=yes tools=yes target=release_debug debug_symbols=no platform=windows bits=32 "$@"
 
  # Windows templates 64 bit
-scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=windows bits=64 "$@" . 2>&1 | tee logs/windows_template_rd_64.log
-scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=windows bits=64 "$@" . 2>&1 | tee logs/windows_template_r_64.log
+scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=windows bits=64 "$@"
+scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=windows bits=64 "$@"
 
 # Windows templates 32 bit
-scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=windows bits=32 "$@" . 2>&1 | tee logs/windows_template_rd_32.log
-scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=windows bits=32 "$@" . 2>&1 | tee logs/windows_template_r_32.log
+scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=windows bits=32 "$@"
+scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=windows bits=32 "$@"