Skip to content

Commit 09b605f

Browse files
committed
Make number of build cores configurable in config.sh
1 parent 5ee9f37 commit 09b605f

File tree

10 files changed

+28
-19
lines changed

10 files changed

+28
-19
lines changed

build-android/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -e
44

55
export BUILD_NAME=official
6-
export SCONS="scons -j16 verbose=yes warnings=no progress=no"
6+
export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
77
export OPTIONS="builtin_libpng=yes builtin_openssl=yes builtin_zlib=yes debug_symbols=no use_static_cpp=yes use_lto=yes"
88
export OPTIONS_MONO="module_mono_enabled=yes mono_static=yes"
99
export TERM=xterm

build-ios/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -e
44

55
export BUILD_NAME=official
6-
export SCONS="scons -j16 verbose=yes warnings=no progress=no"
6+
export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
77
export IOS_SDK="11.2"
88
export OPTIONS="osxcross_sdk=darwin15 builtin_libpng=yes builtin_openssl=yes builtin_zlib=yes debug_symbols=no use_static_cpp=yes"
99
export OPTIONS_MONO="module_mono_enabled=yes mono_static=yes"

build-javascript/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -e
44

55
export BUILD_NAME=official
6-
export SCONS="scons -j16 verbose=yes warnings=no progress=no"
6+
export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
77
export OPTIONS="builtin_libpng=yes builtin_openssl=yes builtin_zlib=yes debug_symbols=no use_static_cpp=yes use_lto=yes"
88
export OPTIONS_MONO="module_mono_enabled=yes mono_static=yes"
99
export TERM=xterm

build-linux/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -e
44

55
export BUILD_NAME=official
6-
export SCONS="scons -j16 verbose=yes warnings=no progress=no"
6+
export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
77
export OPTIONS="builtin_libpng=yes builtin_openssl=yes builtin_zlib=yes debug_symbols=no use_static_cpp=yes use_lto=yes"
88
export OPTIONS_MONO="module_mono_enabled=yes mono_static=yes"
99
export TERM=xterm

build-macosx/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -e
44

55
export BUILD_NAME=official
6-
export SCONS="scons -j16 verbose=yes warnings=no progress=no"
6+
export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
77
export OPTIONS="osxcross_sdk=darwin17 builtin_libpng=yes builtin_openssl=yes builtin_zlib=yes debug_symbols=no use_static_cpp=yes use_lto=yes"
88
export OPTIONS_MONO="module_mono_enabled=yes mono_static=yes"
99
export TERM=xterm

build-mono-glue/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -e
44

55
export BUILD_NAME=official
66
export OPTIONS="builtin_libpng=yes builtin_openssl=yes builtin_zlib=yes debug_symbols=no"
7-
export SCONS="scons -j16 verbose=yes warnings=no progress=no"
7+
export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
88
export TERM=xterm
99
export MONO32_PREFIX=/usr
1010
export MONO64_PREFIX=/usr

build-server/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -e
44

55
export BUILD_NAME=official
6-
export SCONS="scons -j16 verbose=yes warnings=no progress=no"
6+
export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
77
export OPTIONS="builtin_libpng=yes builtin_openssl=yes builtin_zlib=yes debug_symbols=no use_static_cpp=yes use_lto=yes"
88
export MONO_OPTIONS="module_mono_enabled=yes mono_static=yes copy_mono_root=yes"
99
export TERM=xterm

build-windows/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -e
44

55
export BUILD_NAME=official
6-
export SCONS="scons -j16 verbose=yes warnings=no progress=no"
6+
export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
77
export OPTIONS="builtin_libpng=yes builtin_openssl=yes builtin_zlib=yes debug_symbols=no use_static_cpp=yes use_lto=yes"
88
export OPTIONS_MONO="module_mono_enabled=yes mono_static=yes"
99
export TERM=xterm

build.sh

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,17 @@ set -e
44

55
OPTIND=1
66

7-
# For default registry.
7+
# For default registry and number of cores.
88
if [ ! -e config.sh ]; then
99
echo "No config.sh, copying default values from config.sh.in."
1010
cp config.sh.in config.sh
1111
fi
1212
source ./config.sh
1313

14+
if [ -z "${NUM_CORES}" ]; then
15+
export NUM_CORES=16
16+
fi
17+
1418
registry="${REGISTRY}"
1519
username=""
1620
password=""
@@ -123,35 +127,37 @@ export basedir="$(pwd)"
123127
mkdir -p ${basedir}/out
124128
mkdir -p ${basedir}/out/logs
125129

130+
export podman_run="${podman} run -it --rm --env NUM_CORES -v ${basedir}/godot.tar.gz:/root/godot.tar.gz -v ${basedir}/mono-glue:/root/mono-glue -w /root/"
131+
126132
mkdir -p ${basedir}/mono-glue
127-
${podman} run -it --rm -v ${basedir}/godot.tar.gz:/root/godot.tar.gz -v ${basedir}/build-mono-glue:/root/build -v ${basedir}/mono-glue:/root/mono-glue -w /root/ ${registry}/godot/mono-glue:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/mono-glue
133+
${podman_run} -v ${basedir}/build-mono-glue:/root/build ${registry}/godot/mono-glue:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/mono-glue
128134

129135
mkdir -p ${basedir}/out/windows
130-
${podman} run -it --rm -v ${basedir}/godot.tar.gz:/root/godot.tar.gz -v ${basedir}/build-windows:/root/build -v ${basedir}/mono-glue:/root/mono-glue -v ${basedir}/out/windows:/root/out -w /root/ ${registry}/godot/windows:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/windows
136+
${podman_run} -v ${basedir}/build-windows:/root/build -v ${basedir}/out/windows:/root/out ${registry}/godot/windows:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/windows
131137

132138
mkdir -p ${basedir}/out/linux/x64
133-
${podman} run -it --rm -v ${basedir}/godot.tar.gz:/root/godot.tar.gz -v ${basedir}/build-linux:/root/build -v ${basedir}/mono-glue:/root/mono-glue -v ${basedir}/out/linux/x64:/root/out -w /root/ ${registry}/godot/ubuntu-64:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/linux64
139+
${podman_run} -v ${basedir}/build-linux:/root/build -v ${basedir}/out/linux/x64:/root/out ${registry}/godot/ubuntu-64:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/linux64
134140

135141
mkdir -p ${basedir}/out/linux/x86
136-
${podman} run -it --rm -v ${basedir}/godot.tar.gz:/root/godot.tar.gz -v ${basedir}/build-linux:/root/build -v ${basedir}/mono-glue:/root/mono-glue -v ${basedir}/out/linux/x86:/root/out -w /root/ ${registry}/godot/ubuntu-32:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/linux32
142+
${podman_run} -v ${basedir}/build-linux:/root/build -v ${basedir}/out/linux/x86:/root/out ${registry}/godot/ubuntu-32:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/linux32
137143

138144
mkdir -p ${basedir}/out/server/x64
139-
${podman} run -it --rm -v ${basedir}/godot.tar.gz:/root/godot.tar.gz -v ${basedir}/build-server:/root/build -v ${basedir}/mono-glue:/root/mono-glue -v ${basedir}/out/server/x64:/root/out -w /root/ ${registry}/godot/ubuntu-64:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/server
145+
${podman_run} -v ${basedir}/build-server:/root/build -v ${basedir}/out/server/x64:/root/out ${registry}/godot/ubuntu-64:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/server
140146

141147
mkdir -p ${basedir}/out/javascript
142-
${podman} run -it --rm -v ${basedir}/godot.tar.gz:/root/godot.tar.gz -v ${basedir}/build-javascript:/root/build -v ${basedir}/mono-glue:/root/mono-glue -v ${basedir}/out/javascript:/root/out -w /root/ ${registry}/godot/javascript:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/javascript
148+
${podman_run} -v ${basedir}/build-javascript:/root/build -v ${basedir}/out/javascript:/root/out ${registry}/godot/javascript:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/javascript
143149

144150
mkdir -p ${basedir}/out/macosx/x64
145-
${podman} run -it --rm -v ${basedir}/godot.tar.gz:/root/godot.tar.gz -v ${basedir}/build-macosx:/root/build -v ${basedir}/mono-glue:/root/mono-glue -v ${basedir}/out/macosx/x64:/root/out -w /root/ ${registry}/godot-private/macosx:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/macosx
151+
${podman_run} -v ${basedir}/build-macosx:/root/build -v ${basedir}/out/macosx/x64:/root/out ${registry}/godot-private/macosx:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/macosx
146152

147153
mkdir -p ${basedir}/out/android
148-
${podman} run -it --rm -v ${basedir}/godot.tar.gz:/root/godot.tar.gz -v ${basedir}/build-android:/root/build -v ${basedir}/out/android:/root/out -w /root/ ${registry}/godot-private/android:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/android
154+
${podman_run} -v ${basedir}/build-android:/root/build -v ${basedir}/out/android:/root/out ${registry}/godot-private/android:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/android
149155

150156
mkdir -p ${basedir}/out/ios
151-
${podman} run -it --rm -v ${basedir}/godot.tar.gz:/root/godot.tar.gz -v ${basedir}/build-ios:/root/build -v ${basedir}/out/ios:/root/out -w /root/ ${registry}/godot-private/ios:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/ios
157+
${podman_run} -v ${basedir}/build-ios:/root/build -v ${basedir}/out/ios:/root/out ${registry}/godot-private/ios:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/ios
152158

153159
mkdir -p ${basedir}/out/uwp
154-
${podman} run --ulimit nofile=32768:32768 -it --rm -v ${basedir}/godot.tar.gz:/root/godot.tar.gz -v ${basedir}/build-uwp:/root/build -v ${basedir}/out/uwp:/root/out -w /root/ ${registry}/godot-private/uwp:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/uwp
160+
${podman_run} --ulimit nofile=32768:32768 -v ${basedir}/build-uwp:/root/build -v ${basedir}/out/uwp:/root/out ${registry}/godot-private/uwp:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/uwp
155161

156162
if [ ! -z "$SUDO_UID" ]; then
157163
chown -R "${SUDO_UID}":"${SUDO_GID}" ${basedir}/out

config.sh.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
# https://github.com/godotengine/build-containers
1212
export REGISTRY="registry.prehensile-tales.com"
1313

14+
# Default number of parallel cores for each build.
15+
export NUM_CORES=16
16+
1417
# Set up your own signing keystore and relevant details below.
1518
# If you do not fill all SIGN_* fields, signing will be skipped.
1619

0 commit comments

Comments
 (0)