Skip to content

Commit 3793875

Browse files
authored
Merge pull request #83 from godotengine/drop-uwp
Drop UWP build scripts since it was removed upstream
2 parents 37876d4 + 79967d5 commit 3793875

File tree

7 files changed

+1
-198
lines changed

7 files changed

+1
-198
lines changed

build-release.sh

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -341,43 +341,6 @@ if [ "${build_classical}" == "1" ]; then
341341
cd ..
342342
rm -rf ios_xcode
343343

344-
# ## UWP (Classical) ##
345-
#
346-
# if [ ! -d "deps/angle" ]; then
347-
# echo "Downloading ANGLE binaries from https://github.com/GodotBuilder/godot-builds/releases/tag/_tools"
348-
# mkdir -p deps && cd deps
349-
# curl -LO https://github.com/GodotBuilder/godot-builds/releases/download/_tools/angle.7z
350-
# 7z x angle.7z && rm -f angle.7z
351-
# cd ..
352-
# fi
353-
#
354-
# rm -rf uwp_template_*
355-
# for arch in ARM Win32 x64; do
356-
# cp -r git/misc/dist/uwp_template uwp_template_${arch}
357-
# cp deps/angle/winrt/10/src/Release_${arch}/libEGL.dll \
358-
# deps/angle/winrt/10/src/Release_${arch}/libGLESv2.dll \
359-
# uwp_template_${arch}/
360-
# cp -r uwp_template_${arch} uwp_template_${arch}_debug
361-
# done
362-
#
363-
# cp out/uwp/arm/godot.uwp.template_release.32.arm.exe uwp_template_ARM/godot.uwp.exe
364-
# cp out/uwp/arm/godot.uwp.template_debug.32.arm.exe uwp_template_ARM_debug/godot.uwp.exe
365-
# cd uwp_template_ARM && zip -q -9 -r "${templatesdir}/uwp_arm_release.zip" * && cd ..
366-
# cd uwp_template_ARM_debug && zip -q -9 -r "${templatesdir}/uwp_arm_debug.zip" * && cd ..
367-
# rm -rf uwp_template_ARM*
368-
#
369-
# cp out/uwp/x86/godot.uwp.template_release.32.x86.exe uwp_template_Win32/godot.uwp.exe
370-
# cp out/uwp/x86/godot.uwp.template_debug.32.x86.exe uwp_template_Win32_debug/godot.uwp.exe
371-
# cd uwp_template_Win32 && zip -q -9 -r "${templatesdir}/uwp_x86_release.zip" * && cd ..
372-
# cd uwp_template_Win32_debug && zip -q -9 -r "${templatesdir}/uwp_x86_debug.zip" * && cd ..
373-
# rm -rf uwp_template_Win32*
374-
#
375-
# cp out/uwp/x64/godot.uwp.template_release.64.x64.exe uwp_template_x64/godot.uwp.exe
376-
# cp out/uwp/x64/godot.uwp.template_debug.64.x64.exe uwp_template_x64_debug/godot.uwp.exe
377-
# cd uwp_template_x64 && zip -q -9 -r "${templatesdir}/uwp_x64_release.zip" * && cd ..
378-
# cd uwp_template_x64_debug && zip -q -9 -r "${templatesdir}/uwp_x64_debug.zip" * && cd ..
379-
# rm -rf uwp_template_x64*
380-
381344
## Templates TPZ (Classical) ##
382345

383346
echo "${templates_version}" > ${templatesdir}/version.txt

build-uwp/build.bat

Lines changed: 0 additions & 3 deletions
This file was deleted.

build-uwp/build.sh

Lines changed: 0 additions & 43 deletions
This file was deleted.

build-uwp/env-arm.bat

Lines changed: 0 additions & 36 deletions
This file was deleted.

build-uwp/env-x64.bat

Lines changed: 0 additions & 35 deletions
This file was deleted.

build-uwp/env-x86.bat

Lines changed: 0 additions & 36 deletions
This file was deleted.

build.sh

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,6 @@ done
8585

8686
export podman=${PODMAN}
8787

88-
if [ $UID != 0 ]; then
89-
echo "WARNING: Running as non-root may cause problems for the uwp build"
90-
fi
91-
9288
if [ -z "${godot_version}" ]; then
9389
echo "-v <version> is mandatory!"
9490
exit 1
@@ -124,7 +120,7 @@ if [ $skip_download == 0 ]; then
124120
if [ ! -z "${logged_in}" ]; then
125121
echo "Fetching private images"
126122

127-
for image in macosx android ios uwp; do
123+
for image in macosx android ios; do
128124
if [ ${force_download} == 1 ] || ! ${podman} image exists godot-private/$image; then
129125
if ! ${podman} pull ${registry}/godot-private/${image}; then
130126
echo "ERROR: image $image does not exist and can't be downloaded"
@@ -208,9 +204,6 @@ ${podman_run} -v ${basedir}/build-android:/root/build -v ${basedir}/out/android:
208204
mkdir -p ${basedir}/out/ios
209205
${podman_run} -v ${basedir}/build-ios:/root/build -v ${basedir}/out/ios:/root/out localhost/godot-ios:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/ios
210206

211-
#mkdir -p ${basedir}/out/uwp
212-
#${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
213-
214207
if [ ! -z "$SUDO_UID" ]; then
215208
chown -R "${SUDO_UID}":"${SUDO_GID}" ${basedir}/git ${basedir}/out ${basedir}/mono-glue ${basedir}/godot*.tar.gz
216209
fi

0 commit comments

Comments
 (0)