Skip to content

Commit e544bb9

Browse files
aaronfrankeaaronfranke
committed
CPU architecture folder name changes
1 parent 0dc9509 commit e544bb9

File tree

3 files changed

+66
-66
lines changed

3 files changed

+66
-66
lines changed

‎build-linux/build.sh

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,27 @@ if [ "${CLASSICAL}" == "1" ]; then
2727
export PATH="${GODOT_SDK_LINUX_X86_64}/bin:${BASE_PATH}"
2828

2929
$SCONS platform=linuxbsd $OPTIONS tools=yes target=release_debug
30-
mkdir -p /root/out/x64/tools
31-
cp -rvp bin/* /root/out/x64/tools
30+
mkdir -p /root/out/x86_64/tools
31+
cp -rvp bin/* /root/out/x86_64/tools
3232
rm -rf bin
3333

3434
$SCONS platform=linuxbsd $OPTIONS tools=no target=release_debug
3535
$SCONS platform=linuxbsd $OPTIONS tools=no target=release
36-
mkdir -p /root/out/x64/templates
37-
cp -rvp bin/* /root/out/x64/templates
36+
mkdir -p /root/out/x86_64/templates
37+
cp -rvp bin/* /root/out/x86_64/templates
3838
rm -rf bin
3939

4040
export PATH="${GODOT_SDK_LINUX_X86}/bin:${BASE_PATH}"
4141

4242
$SCONS platform=linuxbsd $OPTIONS tools=yes target=release_debug bits=32
43-
mkdir -p /root/out/x86/tools
44-
cp -rvp bin/* /root/out/x86/tools
43+
mkdir -p /root/out/x86_32/tools
44+
cp -rvp bin/* /root/out/x86_32/tools
4545
rm -rf bin
4646

4747
$SCONS platform=linuxbsd $OPTIONS tools=no target=release_debug bits=32
4848
$SCONS platform=linuxbsd $OPTIONS tools=no target=release bits=32
49-
mkdir -p /root/out/x86/templates
50-
cp -rvp bin/* /root/out/x86/templates
49+
mkdir -p /root/out/x86_32/templates
50+
cp -rvp bin/* /root/out/x86_32/templates
5151
rm -rf bin
5252
fi
5353

@@ -64,28 +64,28 @@ if [ "${MONO}" == "1" ]; then
6464
export OPTIONS_MONO_PREFIX="${OPTIONS} ${OPTIONS_MONO} mono_prefix=${MONO_PREFIX_X86_64}"
6565

6666
$SCONS platform=linuxbsd $OPTIONS $OPTIONS_MONO tools=yes target=release_debug copy_mono_root=yes
67-
mkdir -p /root/out/x64/tools-mono
68-
cp -rvp bin/* /root/out/x64/tools-mono
67+
mkdir -p /root/out/x86_64/tools-mono
68+
cp -rvp bin/* /root/out/x86_64/tools-mono
6969
rm -rf bin
7070

7171
$SCONS platform=linuxbsd $OPTIONS_MONO_PREFIX tools=no target=release_debug
7272
$SCONS platform=linuxbsd $OPTIONS_MONO_PREFIX tools=no target=release
73-
mkdir -p /root/out/x64/templates-mono
74-
cp -rvp bin/* /root/out/x64/templates-mono
73+
mkdir -p /root/out/x86_64/templates-mono
74+
cp -rvp bin/* /root/out/x86_64/templates-mono
7575
rm -rf bin
7676

7777
export PATH="${GODOT_SDK_LINUX_X86}/bin:${BASE_PATH}"
7878
export OPTIONS_MONO_PREFIX="${OPTIONS} ${OPTIONS_MONO} mono_prefix=${MONO_PREFIX_X86}"
7979

8080
$SCONS platform=linuxbsd $OPTIONS_MONO_PREFIX tools=yes target=release_debug copy_mono_root=yes bits=32
81-
mkdir -p /root/out/x86/tools-mono
82-
cp -rvp bin/* /root/out/x86/tools-mono
81+
mkdir -p /root/out/x86_32/tools-mono
82+
cp -rvp bin/* /root/out/x86_32/tools-mono
8383
rm -rf bin
8484

8585
$SCONS platform=linuxbsd $OPTIONS_MONO_PREFIX tools=no target=release_debug bits=32
8686
$SCONS platform=linuxbsd $OPTIONS_MONO_PREFIX tools=no target=release bits=32
87-
mkdir -p /root/out/x86/templates-mono
88-
cp -rvp bin/* /root/out/x86/templates-mono
87+
mkdir -p /root/out/x86_32/templates-mono
88+
cp -rvp bin/* /root/out/x86_32/templates-mono
8989
rm -rf bin
9090
fi
9191

‎build-release.sh

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -170,30 +170,30 @@ if [ "${build_classical}" == "1" ]; then
170170

171171
# Editor
172172
binname="${godot_basename}_linux.64"
173-
cp out/linux/x64/tools/godot.linuxbsd.opt.tools.64 ${binname}
173+
cp out/linux/x86_64/tools/godot.linuxbsd.opt.tools.64 ${binname}
174174
strip ${binname}
175175
zip -q -9 "${reldir}/${binname}.zip" ${binname}
176176
rm ${binname}
177177

178178
binname="${godot_basename}_linux.32"
179-
cp out/linux/x86/tools/godot.linuxbsd.opt.tools.32 ${binname}
179+
cp out/linux/x86_32/tools/godot.linuxbsd.opt.tools.32 ${binname}
180180
strip ${binname}
181181
zip -q -9 "${reldir}/${binname}.zip" ${binname}
182182
rm ${binname}
183183

184184
# Templates
185-
cp out/linux/x64/templates/godot.linuxbsd.opt.64 ${templatesdir}/linux_x11_64_release
186-
cp out/linux/x64/templates/godot.linuxbsd.opt.debug.64 ${templatesdir}/linux_x11_64_debug
187-
cp out/linux/x86/templates/godot.linuxbsd.opt.32 ${templatesdir}/linux_x11_32_release
188-
cp out/linux/x86/templates/godot.linuxbsd.opt.debug.32 ${templatesdir}/linux_x11_32_debug
185+
cp out/linux/x86_64/templates/godot.linuxbsd.opt.64 ${templatesdir}/linux_x11_64_release
186+
cp out/linux/x86_64/templates/godot.linuxbsd.opt.debug.64 ${templatesdir}/linux_x11_64_debug
187+
cp out/linux/x86_32/templates/godot.linuxbsd.opt.32 ${templatesdir}/linux_x11_32_release
188+
cp out/linux/x86_32/templates/godot.linuxbsd.opt.debug.32 ${templatesdir}/linux_x11_32_debug
189189
strip ${templatesdir}/linux_x11*
190190

191191
## Windows (Classical) ##
192192

193193
# Editor
194194
binname="${godot_basename}_win64.exe"
195195
batname="${godot_basename}_win64_console.cmd"
196-
cp out/windows/x64/tools/godot.windows.opt.tools.64.exe ${binname}
196+
cp out/windows/x86_64/tools/godot.windows.opt.tools.64.exe ${binname}
197197
strip ${binname}
198198
sign_windows ${binname}
199199
echo "@echo off" > ${batname}
@@ -204,7 +204,7 @@ if [ "${build_classical}" == "1" ]; then
204204

205205
binname="${godot_basename}_win32.exe"
206206
batname="${godot_basename}_win32_console.cmd"
207-
cp out/windows/x86/tools/godot.windows.opt.tools.32.exe ${binname}
207+
cp out/windows/x86_32/tools/godot.windows.opt.tools.32.exe ${binname}
208208
strip ${binname}
209209
sign_windows ${binname}
210210
echo "@echo off" > ${batname}
@@ -214,10 +214,10 @@ if [ "${build_classical}" == "1" ]; then
214214
rm ${binname} ${batname}
215215

216216
# Templates
217-
cp out/windows/x64/templates/godot.windows.opt.64.exe ${templatesdir}/windows_64_release.exe
218-
cp out/windows/x64/templates/godot.windows.opt.debug.64.exe ${templatesdir}/windows_64_debug.exe
219-
cp out/windows/x86/templates/godot.windows.opt.32.exe ${templatesdir}/windows_32_release.exe
220-
cp out/windows/x86/templates/godot.windows.opt.debug.32.exe ${templatesdir}/windows_32_debug.exe
217+
cp out/windows/x86_64/templates/godot.windows.opt.64.exe ${templatesdir}/windows_64_release.exe
218+
cp out/windows/x86_64/templates/godot.windows.opt.debug.64.exe ${templatesdir}/windows_64_debug.exe
219+
cp out/windows/x86_32/templates/godot.windows.opt.32.exe ${templatesdir}/windows_32_release.exe
220+
cp out/windows/x86_32/templates/godot.windows.opt.debug.32.exe ${templatesdir}/windows_32_debug.exe
221221
strip ${templatesdir}/windows*.exe
222222

223223
## macOS (Classical) ##
@@ -354,44 +354,44 @@ if [ "${build_mono}" == "1" ]; then
354354
# Editor
355355
binbasename="${godot_basename}_mono_linux"
356356
mkdir -p ${binbasename}_64
357-
cp out/linux/x64/tools-mono/godot.linuxbsd.opt.tools.64.mono ${binbasename}_64/${binbasename}.64
357+
cp out/linux/x86_64/tools-mono/godot.linuxbsd.opt.tools.64.mono ${binbasename}_64/${binbasename}.64
358358
strip ${binbasename}_64/${binbasename}.64
359-
cp -rp out/linux/x64/tools-mono/GodotSharp ${binbasename}_64/
359+
cp -rp out/linux/x86_64/tools-mono/GodotSharp ${binbasename}_64/
360360
cp -rp out/aot-compilers ${binbasename}_64/GodotSharp/Tools/
361361
zip -r -q -9 "${reldir_mono}/${binbasename}_64.zip" ${binbasename}_64
362362
rm -rf ${binbasename}_64
363363

364364
binbasename="${godot_basename}_mono_linux"
365365
mkdir -p ${binbasename}_32
366-
cp out/linux/x86/tools-mono/godot.linuxbsd.opt.tools.32.mono ${binbasename}_32/${binbasename}.32
366+
cp out/linux/x86_32/tools-mono/godot.linuxbsd.opt.tools.32.mono ${binbasename}_32/${binbasename}.32
367367
strip ${binbasename}_32/${binbasename}.32
368-
cp -rp out/linux/x86/tools-mono/GodotSharp/ ${binbasename}_32/
368+
cp -rp out/linux/x86_32/tools-mono/GodotSharp/ ${binbasename}_32/
369369
cp -rp out/aot-compilers ${binbasename}_32/GodotSharp/Tools/
370370
zip -r -q -9 "${reldir_mono}/${binbasename}_32.zip" ${binbasename}_32
371371
rm -rf ${binbasename}_32
372372

373373
# Templates
374-
cp -rp out/linux/x64/templates-mono/data.mono.linuxbsd.64.* ${templatesdir_mono}/
375-
cp out/linux/x64/templates-mono/godot.linuxbsd.opt.debug.64.mono ${templatesdir_mono}/linux_x11_64_debug
376-
cp out/linux/x64/templates-mono/godot.linuxbsd.opt.64.mono ${templatesdir_mono}/linux_x11_64_release
377-
cp -rp out/linux/x86/templates-mono/data.mono.linuxbsd.32.* ${templatesdir_mono}/
378-
cp out/linux/x86/templates-mono/godot.linuxbsd.opt.debug.32.mono ${templatesdir_mono}/linux_x11_32_debug
379-
cp out/linux/x86/templates-mono/godot.linuxbsd.opt.32.mono ${templatesdir_mono}/linux_x11_32_release
374+
cp -rp out/linux/x86_64/templates-mono/data.mono.linuxbsd.64.* ${templatesdir_mono}/
375+
cp out/linux/x86_64/templates-mono/godot.linuxbsd.opt.debug.64.mono ${templatesdir_mono}/linux_x11_64_debug
376+
cp out/linux/x86_64/templates-mono/godot.linuxbsd.opt.64.mono ${templatesdir_mono}/linux_x11_64_release
377+
cp -rp out/linux/x86_32/templates-mono/data.mono.linuxbsd.32.* ${templatesdir_mono}/
378+
cp out/linux/x86_32/templates-mono/godot.linuxbsd.opt.debug.32.mono ${templatesdir_mono}/linux_x11_32_debug
379+
cp out/linux/x86_32/templates-mono/godot.linuxbsd.opt.32.mono ${templatesdir_mono}/linux_x11_32_release
380380
strip ${templatesdir_mono}/linux_x11*
381381

382382
mkdir -p ${templatesdir_mono}/bcl
383-
cp -r out/linux/x64/tools-mono/GodotSharp/Mono/lib/mono/4.5/ ${templatesdir_mono}/bcl/net_4_x
383+
cp -r out/linux/x86_64/tools-mono/GodotSharp/Mono/lib/mono/4.5/ ${templatesdir_mono}/bcl/net_4_x
384384

385385
## Windows (Mono) ##
386386

387387
# Editor
388388
binname="${godot_basename}_mono_win64"
389389
batname="${godot_basename}_mono_win64_console.cmd"
390390
mkdir -p ${binname}
391-
cp out/windows/x64/tools-mono/godot.windows.opt.tools.64.mono.exe ${binname}/${binname}.exe
391+
cp out/windows/x86_64/tools-mono/godot.windows.opt.tools.64.mono.exe ${binname}/${binname}.exe
392392
strip ${binname}/${binname}.exe
393393
sign_windows ${binname}/${binname}.exe
394-
cp -rp out/windows/x64/tools-mono/GodotSharp ${binname}/
394+
cp -rp out/windows/x86_64/tools-mono/GodotSharp ${binname}/
395395
cp -rp out/aot-compilers ${binname}/GodotSharp/Tools/
396396
echo "@echo off" > ${batname}
397397
echo ${binname}.exe >> ${batname}
@@ -403,10 +403,10 @@ if [ "${build_mono}" == "1" ]; then
403403
binname="${godot_basename}_mono_win32"
404404
batname="${godot_basename}_mono_win32_console.cmd"
405405
mkdir -p ${binname}
406-
cp out/windows/x86/tools-mono/godot.windows.opt.tools.32.mono.exe ${binname}/${binname}.exe
406+
cp out/windows/x86_32/tools-mono/godot.windows.opt.tools.32.mono.exe ${binname}/${binname}.exe
407407
strip ${binname}/${binname}.exe
408408
sign_windows ${binname}/${binname}.exe
409-
cp -rp out/windows/x86/tools-mono/GodotSharp ${binname}/
409+
cp -rp out/windows/x86_32/tools-mono/GodotSharp ${binname}/
410410
cp -rp out/aot-compilers ${binname}/GodotSharp/Tools/
411411
echo "@echo off" > ${batname}
412412
echo ${binname}.exe >> ${batname}
@@ -416,16 +416,16 @@ if [ "${build_mono}" == "1" ]; then
416416
rm -rf ${binname}
417417

418418
# Templates
419-
cp -rp out/windows/x64/templates-mono/data.mono.windows.64.* ${templatesdir_mono}/
420-
cp out/windows/x64/templates-mono/godot.windows.opt.debug.64.mono.exe ${templatesdir_mono}/windows_64_debug.exe
421-
cp out/windows/x64/templates-mono/godot.windows.opt.64.mono.exe ${templatesdir_mono}/windows_64_release.exe
422-
cp -rp out/windows/x86/templates-mono/data.mono.windows.32.* ${templatesdir_mono}/
423-
cp out/windows/x86/templates-mono/godot.windows.opt.debug.32.mono.exe ${templatesdir_mono}/windows_32_debug.exe
424-
cp out/windows/x86/templates-mono/godot.windows.opt.32.mono.exe ${templatesdir_mono}/windows_32_release.exe
419+
cp -rp out/windows/x86_64/templates-mono/data.mono.windows.64.* ${templatesdir_mono}/
420+
cp out/windows/x86_64/templates-mono/godot.windows.opt.debug.64.mono.exe ${templatesdir_mono}/windows_64_debug.exe
421+
cp out/windows/x86_64/templates-mono/godot.windows.opt.64.mono.exe ${templatesdir_mono}/windows_64_release.exe
422+
cp -rp out/windows/x86_32/templates-mono/data.mono.windows.32.* ${templatesdir_mono}/
423+
cp out/windows/x86_32/templates-mono/godot.windows.opt.debug.32.mono.exe ${templatesdir_mono}/windows_32_debug.exe
424+
cp out/windows/x86_32/templates-mono/godot.windows.opt.32.mono.exe ${templatesdir_mono}/windows_32_release.exe
425425
strip ${templatesdir_mono}/windows*.exe
426426

427427
mkdir -p ${templatesdir_mono}/bcl
428-
cp -r out/windows/x64/tools-mono/GodotSharp/Mono/lib/mono/4.5/ ${templatesdir_mono}/bcl/net_4_x_win
428+
cp -r out/windows/x86_64/tools-mono/GodotSharp/Mono/lib/mono/4.5/ ${templatesdir_mono}/bcl/net_4_x_win
429429

430430
## macOS (Mono) ##
431431

‎build-windows/build.sh

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,25 @@ if [ "${CLASSICAL}" == "1" ]; then
2222
echo "Starting classical build for Windows..."
2323

2424
$SCONS platform=windows bits=64 $OPTIONS tools=yes target=release_debug
25-
mkdir -p /root/out/x64/tools
26-
cp -rvp bin/* /root/out/x64/tools
25+
mkdir -p /root/out/x86_64/tools
26+
cp -rvp bin/* /root/out/x86_64/tools
2727
rm -rf bin
2828

2929
$SCONS platform=windows bits=64 $OPTIONS tools=no target=release_debug
3030
$SCONS platform=windows bits=64 $OPTIONS tools=no target=release
31-
mkdir -p /root/out/x64/templates
32-
cp -rvp bin/* /root/out/x64/templates
31+
mkdir -p /root/out/x86_64/templates
32+
cp -rvp bin/* /root/out/x86_64/templates
3333
rm -rf bin
3434

3535
$SCONS platform=windows bits=32 $OPTIONS tools=yes target=release_debug
36-
mkdir -p /root/out/x86/tools
37-
cp -rvp bin/* /root/out/x86/tools
36+
mkdir -p /root/out/x86_32/tools
37+
cp -rvp bin/* /root/out/x86_32/tools
3838
rm -rf bin
3939

4040
$SCONS platform=windows bits=32 $OPTIONS tools=no target=release_debug
4141
$SCONS platform=windows bits=32 $OPTIONS tools=no target=release
42-
mkdir -p /root/out/x86/templates
43-
cp -rvp bin/* /root/out/x86/templates
42+
mkdir -p /root/out/x86_32/templates
43+
cp -rvp bin/* /root/out/x86_32/templates
4444
rm -rf bin
4545
fi
4646

@@ -56,27 +56,27 @@ if [ "${MONO}" == "1" ]; then
5656
export OPTIONS_MONO_PREFIX="${OPTIONS} ${OPTIONS_MONO} mono_prefix=${MONO_PREFIX_X86_64}"
5757

5858
$SCONS platform=windows bits=64 $OPTIONS_MONO_PREFIX tools=yes target=release_debug copy_mono_root=yes
59-
mkdir -p /root/out/x64/tools-mono
60-
cp -rvp bin/* /root/out/x64/tools-mono
59+
mkdir -p /root/out/x86_64/tools-mono
60+
cp -rvp bin/* /root/out/x86_64/tools-mono
6161
rm -rf bin
6262

6363
$SCONS platform=windows bits=64 $OPTIONS_MONO_PREFIX tools=no target=release_debug
6464
$SCONS platform=windows bits=64 $OPTIONS_MONO_PREFIX tools=no target=release
65-
mkdir -p /root/out/x64/templates-mono
66-
cp -rvp bin/* /root/out/x64/templates-mono
65+
mkdir -p /root/out/x86_64/templates-mono
66+
cp -rvp bin/* /root/out/x86_64/templates-mono
6767
rm -rf bin
6868

6969
export OPTIONS_MONO_PREFIX="${OPTIONS} ${OPTIONS_MONO} mono_prefix=${MONO_PREFIX_X86}"
7070

7171
$SCONS platform=windows bits=32 $OPTIONS_MONO_PREFIX tools=yes target=release_debug copy_mono_root=yes
72-
mkdir -p /root/out/x86/tools-mono
73-
cp -rvp bin/* /root/out/x86/tools-mono
72+
mkdir -p /root/out/x86_32/tools-mono
73+
cp -rvp bin/* /root/out/x86_32/tools-mono
7474
rm -rf bin
7575

7676
$SCONS platform=windows bits=32 $OPTIONS_MONO_PREFIX tools=no target=release_debug
7777
$SCONS platform=windows bits=32 $OPTIONS_MONO_PREFIX tools=no target=release
78-
mkdir -p /root/out/x86/templates-mono
79-
cp -rvp bin/* /root/out/x86/templates-mono
78+
mkdir -p /root/out/x86_32/templates-mono
79+
cp -rvp bin/* /root/out/x86_32/templates-mono
8080
rm -rf bin
8181
fi
8282

0 commit comments

Comments
 (0)