Moved podman linux build commands to a new script.

misc/build-containers/engine_build_scripts/linux.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+set -e
+
+# pkg-config wrongly points to lib instead of lib64 for arch-dependent header.
+sed -i ${GODOT_SDK_LINUX_X86_64}/x86_64-godot-linux-gnu/sysroot/usr/lib/pkgconfig/dbus-1.pc -e "s@/lib@/lib64@g"
+
+export PATH="${GODOT_SDK_LINUX_X86_64}/bin:${BASE_PATH}"
+
+# Linux editor 64 bit
+scons tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 bits=64 "$@" . 2>&1 | tee logs/linux_ed_64.log
+
+# Linux templates 64 bit
+scons 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 tools=no target=release custom_modules_shared=no debug_symbols=no platform=x11 bits=64 "$@" . 2>&1 | tee logs/linux_template_r_64.log
+
+# Linux headless (editor) 64bit
+scons tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=server bits=64 "$@" . 2>&1 | tee logs/headless.log
+
+# Linux server (templates) 64bit
+scons tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=server bits=64 "$@" . 2>&1 | tee logs/server_rd.log
+scons tools=no target=release custom_modules_shared=no debug_symbols=no platform=server bits=64 "$@" . 2>&1 | tee logs/server_d.log
+
+export PATH="${GODOT_SDK_LINUX_X86}/bin:${BASE_PATH}"
+
+# Linux editor 32 bit
+scons tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 bits=32 "$@" . 2>&1 | tee logs/linux_ed_32.log
+
+# Linux templates 32 bit
+scons 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 tools=no target=release custom_modules_shared=no debug_symbols=no platform=x11 bits=32 "$@" . 2>&1 | tee logs/linux_template_r_32.log
+
+export PATH="${GODOT_SDK_LINUX_ARMHF}/bin:${BASE_PATH}"
+
+# Linux editor armhf
+scons tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 arch=armhf "$@" . 2>&1 | tee logs/linux_ed_32.log
+
+# Linux templates armhf
+scons tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 arch=armhf "$@" . 2>&1 | tee logs/linux_template_rd_32.log
+scons tools=no target=release custom_modules_shared=no debug_symbols=no platform=x11 arch=armhf "$@" . 2>&1 | tee logs/linux_template_r_32.log

misc/build-containers/podman_build_all.sh

@@ -8,6 +8,8 @@ if [ -z $podman ]; then
   exit 1
 fi
 
+basedir=$(pwd)/
+
 cd ../..
 
 project_root=$(pwd)/
@@ -17,14 +19,6 @@ mkdir -p logs
 
 rm -f modules/modules_enabled.gen.h
 
-#todo -----
-# pkg-config wrongly points to lib instead of lib64 for arch-dependent header.
-sed -i ${GODOT_SDK_LINUX_X86_64}/x86_64-godot-linux-gnu/sysroot/usr/lib/pkgconfig/dbus-1.pc -e "s@/lib@/lib64@g"
-export PATH="${GODOT_SDK_LINUX_X86_64}/bin:${BASE_PATH}"
-export PATH="${GODOT_SDK_LINUX_X86}/bin:${BASE_PATH}"
-export PATH="${GODOT_SDK_LINUX_ARMHF}/bin:${BASE_PATH}"
-#--------
-
 # Windows editor (release debug) 64 bit
 $podman run -v ${project_root}:/root/project -w /root/project pandemonium-windows:${img_version} scons tools=yes target=release_debug debug_symbols=no platform=windows bits=64 "$@" . 2>&1 | tee logs/windows_ed_64.log
 rm -f modules/modules_enabled.gen.h
@@ -44,34 +38,12 @@ rm -f modules/modules_enabled.gen.h
 $podman run -v ${project_root}:/root/project -w /root/project pandemonium-windows:${img_version} scons tools=no target=release custom_modules_shared=no debug_symbols=no platform=windows bits=32 "$@" . 2>&1 | tee logs/windows_template_r_32.log
 rm -f modules/modules_enabled.gen.h
 
-# Linux editor 64 bit
+# Linux Build
-$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 bits=64 "$@" . 2>&1 | tee logs/linux_ed_64.log
+$podman run \
-rm -f modules/modules_enabled.gen.h
+        -v ${basedir}/engine_build_scripts:/root/engine_build_scripts \
-# Linux editor 32 bit
+        -v ${project_root}:/root/project \
-$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 bits=32 "$@" . 2>&1 | tee logs/linux_ed_32.log
+        -w /root/project pandemonium-linux:${img_version} \
-rm -f modules/modules_enabled.gen.h
+        bash /root/engine_build_scripts/linux.sh "$@" 2>&1 | tee logs/linux.log
-
-# Linux templates 64 bit
-$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons 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
-rm -f modules/modules_enabled.gen.h
-$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=no target=release custom_modules_shared=no debug_symbols=no platform=x11 bits=64 "$@" . 2>&1 | tee logs/linux_template_r_64.log
-rm -f modules/modules_enabled.gen.h
-
-# Linux templates 32 bit
-$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons 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
-rm -f modules/modules_enabled.gen.h
-$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=no target=release custom_modules_shared=no debug_symbols=no platform=x11 bits=32 "$@" . 2>&1 | tee logs/linux_template_r_32.log
-rm -f modules/modules_enabled.gen.h
-
-# Linux headless (editor) 64bit
-$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=server bits=64 "$@" . 2>&1 | tee logs/headless.log
-rm -f modules/modules_enabled.gen.h
-
-# Linux server (templates) 64bit
-$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=server bits=64 "$@" . 2>&1 | tee logs/server_rd.log
-rm -f modules/modules_enabled.gen.h
-$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=no target=release custom_modules_shared=no debug_symbols=no platform=server bits=64 "$@" . 2>&1 | tee logs/server_d.log
-rm -f modules/modules_enabled.gen.h
 
 # Javascript editor
 $podman run -v ${project_root}:/root/project -w /root/project pandemonium-javascript:${img_version} bash -c 'source /root/emsdk/emsdk_env.sh;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