Skip to content

Commit ef6c745

Browse files
committed
Web: Add threads=no template builds
1 parent 3fd3880 commit ef6c745

File tree

2 files changed

+35
-4
lines changed

2 files changed

+35
-4
lines changed

build-release.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,9 +341,15 @@ if [ "${build_classical}" == "1" ]; then
341341
cp out/web/templates/godot.web.template_release.wasm32.zip ${templatesdir}/web_release.zip
342342
cp out/web/templates/godot.web.template_debug.wasm32.zip ${templatesdir}/web_debug.zip
343343

344+
cp out/web/templates/godot.web.template_release.wasm32.nothreads.zip ${templatesdir}/web_nothreads_release.zip
345+
cp out/web/templates/godot.web.template_debug.wasm32.nothreads.zip ${templatesdir}/web_nothreads_debug.zip
346+
344347
cp out/web/templates/godot.web.template_release.wasm32.dlink.zip ${templatesdir}/web_dlink_release.zip
345348
cp out/web/templates/godot.web.template_debug.wasm32.dlink.zip ${templatesdir}/web_dlink_debug.zip
346349

350+
cp out/web/templates/godot.web.template_release.wasm32.nothreads.dlink.zip ${templatesdir}/web_dlink_nothreads_release.zip
351+
cp out/web/templates/godot.web.template_debug.wasm32.nothreads.dlink.zip ${templatesdir}/web_dlink_nothreads_debug.zip
352+
347353
## Android (Classical) ##
348354

349355
# Lib for direct download

build-web/build.sh

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,17 @@ set -e
88
# we run all builds in parallel each from their own folder.
99
export NUM_JOBS=5
1010
declare -a JOBS=(
11-
"target=editor use_closure_compiler=yes"
1211
"target=template_debug"
1312
"target=template_release"
1413
"target=template_debug dlink_enabled=yes"
1514
"target=template_release dlink_enabled=yes"
1615
)
16+
declare -a JOBS_NOTHREADS=(
17+
"target=template_debug threads=no"
18+
"target=template_release threads=no"
19+
"target=template_debug dlink_enabled=yes threads=no"
20+
"target=template_release dlink_enabled=yes threads=no"
21+
)
1722

1823
export SCONS="scons -j$(expr ${NUM_CORES} / ${NUM_JOBS}) verbose=yes warnings=no progress=no"
1924
export OPTIONS="production=yes"
@@ -32,24 +37,44 @@ tar xf /root/godot.tar.gz --strip-components=1
3237
if [ "${CLASSICAL}" == "1" ]; then
3338
echo "Starting classical build for Web..."
3439

35-
for i in {0..4}; do
40+
for i in {0..3}; do
3641
cp -r /root/godot /root/godot$i
3742
cd /root/godot$i
3843
echo "$SCONS platform=web ${OPTIONS} ${JOBS[$i]}"
3944
$SCONS platform=web ${OPTIONS} ${JOBS[$i]} &
4045
pids[$i]=$!
4146
done
4247

48+
for i in {0..3}; do
49+
cp -r /root/godot /root/godot-nothreads$i
50+
cd /root/godot-nothreads$i
51+
echo "$SCONS platform=web ${OPTIONS} ${JOBS_NOTHREADS[$i]}"
52+
$SCONS platform=web ${OPTIONS} ${JOBS_NOTHREADS[$i]} &
53+
pids_nothreads[$i]=$!
54+
done
55+
56+
cd /root/godot
57+
echo "$SCONS platform=web ${OPTIONS} target=editor use_closure_compiler=yes"
58+
$SCONS platform=web ${OPTIONS} target=editor use_closure_compiler=yes &
59+
pid_editor=$!
60+
4361
for pid in ${pids[*]}; do
4462
wait $pid
4563
done
4664

65+
for pid in ${pids_nothreads[*]}; do
66+
wait $pid
67+
done
68+
69+
wait $pid_editor
70+
4771
mkdir -p /root/out/tools
48-
cp -rvp /root/godot0/bin/*.editor*.zip /root/out/tools
72+
cp -rvp /root/godot/bin/*.editor*.zip /root/out/tools
4973

5074
mkdir -p /root/out/templates
51-
for i in {1..4}; do
75+
for i in {0..3}; do
5276
cp -rvp /root/godot$i/bin/*.zip /root/out/templates
77+
cp -rvp /root/godot-nothreads$i/bin/*.zip /root/out/templates
5378
done
5479
fi
5580

0 commit comments

Comments
 (0)