diff --git a/build-release.sh b/build-release.sh index 76ed59d..037f244 100755 --- a/build-release.sh +++ b/build-release.sh @@ -341,43 +341,6 @@ if [ "${build_classical}" == "1" ]; then cd .. rm -rf ios_xcode -# ## UWP (Classical) ## -# -# if [ ! -d "deps/angle" ]; then -# echo "Downloading ANGLE binaries from https://github.com/GodotBuilder/godot-builds/releases/tag/_tools" -# mkdir -p deps && cd deps -# curl -LO https://github.com/GodotBuilder/godot-builds/releases/download/_tools/angle.7z -# 7z x angle.7z && rm -f angle.7z -# cd .. -# fi -# -# rm -rf uwp_template_* -# for arch in ARM Win32 x64; do -# cp -r git/misc/dist/uwp_template uwp_template_${arch} -# cp deps/angle/winrt/10/src/Release_${arch}/libEGL.dll \ -# deps/angle/winrt/10/src/Release_${arch}/libGLESv2.dll \ -# uwp_template_${arch}/ -# cp -r uwp_template_${arch} uwp_template_${arch}_debug -# done -# -# cp out/uwp/arm/godot.uwp.template_release.32.arm.exe uwp_template_ARM/godot.uwp.exe -# cp out/uwp/arm/godot.uwp.template_debug.32.arm.exe uwp_template_ARM_debug/godot.uwp.exe -# cd uwp_template_ARM && zip -q -9 -r "${templatesdir}/uwp_arm_release.zip" * && cd .. -# cd uwp_template_ARM_debug && zip -q -9 -r "${templatesdir}/uwp_arm_debug.zip" * && cd .. -# rm -rf uwp_template_ARM* -# -# cp out/uwp/x86/godot.uwp.template_release.32.x86.exe uwp_template_Win32/godot.uwp.exe -# cp out/uwp/x86/godot.uwp.template_debug.32.x86.exe uwp_template_Win32_debug/godot.uwp.exe -# cd uwp_template_Win32 && zip -q -9 -r "${templatesdir}/uwp_x86_release.zip" * && cd .. -# cd uwp_template_Win32_debug && zip -q -9 -r "${templatesdir}/uwp_x86_debug.zip" * && cd .. -# rm -rf uwp_template_Win32* -# -# cp out/uwp/x64/godot.uwp.template_release.64.x64.exe uwp_template_x64/godot.uwp.exe -# cp out/uwp/x64/godot.uwp.template_debug.64.x64.exe uwp_template_x64_debug/godot.uwp.exe -# cd uwp_template_x64 && zip -q -9 -r "${templatesdir}/uwp_x64_release.zip" * && cd .. -# cd uwp_template_x64_debug && zip -q -9 -r "${templatesdir}/uwp_x64_debug.zip" * && cd .. -# rm -rf uwp_template_x64* - ## Templates TPZ (Classical) ## echo "${templates_version}" > ${templatesdir}/version.txt diff --git a/build-uwp/build.bat b/build-uwp/build.bat deleted file mode 100755 index 9eb5dd9..0000000 --- a/build-uwp/build.bat +++ /dev/null @@ -1,3 +0,0 @@ -call z:\root\build\env-%1.bat - -%SCONS% platform=uwp %OPTIONS% tools=no target=%2 LINK="\"C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\bin\HostX64\%1\link.exe\"" diff --git a/build-uwp/build.sh b/build-uwp/build.sh deleted file mode 100755 index 2793ffc..0000000 --- a/build-uwp/build.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -set -e - -# Config - -export SCONS="call scons -j${NUM_CORES} verbose=yes warnings=no progress=no" -export OPTIONS="production=yes" -export BUILD_ARCHES="x86 x64 arm" -export ANGLE_SRC_PATH='c:\angle' - -rm -rf godot -mkdir godot -cd godot -tar xf /root/godot.tar.gz --strip-components=1 - -# Classical - -if [ "${CLASSICAL}" == "1" ]; then - echo "Starting classical build for UWP..." - - for arch in ${BUILD_ARCHES}; do - for release in release release_debug; do - wine cmd /c /root/build/build.bat $arch $release - - sync - wineserver -kw - - mkdir -p /root/out/$arch - mv bin/* /root/out/$arch - done - done -fi - -# Mono - -if [ "${MONO}" == "1" ]; then - echo "No Mono support for UWP yet." - #cp /root/mono-glue/*.cpp modules/mono/glue/ - #cp -r /root/mono-glue/Managed/Generated modules/mono/glue/Managed/ -fi - -echo "UWP build successful" diff --git a/build-uwp/env-arm.bat b/build-uwp/env-arm.bat deleted file mode 100755 index 8db3697..0000000 --- a/build-uwp/env-arm.bat +++ /dev/null @@ -1,36 +0,0 @@ -set ALLUSERSPROFILE=C:\ProgramData -set CommandPromptType=Native -set CommonProgramFiles=C:\Program Files\Common Files -set CommonProgramFiles(x86)=C:\Program Files (x86)\Common Files -set CommonProgramW6432=C:\Program Files\Common Files -set DevEnvDir=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\ -set ExtensionSdkDir=C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs -set Framework40Version=v4.0 -set FrameworkDir=C:\Windows\Microsoft.NET\Framework64\ -set FrameworkDir64=C:\Windows\Microsoft.NET\Framework64\ -set FrameworkVersion=v4.0.30319 -set FrameworkVersion64=v4.0.30319 -set VCIDEInstallDir=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\VC\ -set VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\ -set VCToolsInstallDir=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\ -set VCToolsRedistDir=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Redist\MSVC\14.16.27012\ -set VCToolsVersion=14.16.27023 -set VisualStudioVersion=15.0 -set VS150COMNTOOLS=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\Tools\ -set VSCMD_ARG_app_plat=UWP -set Platform=arm -set VSCMD_ARG_HOST_ARCH=x86 -set VSCMD_ARG_TGT_ARCH=arm -set VSCMD_ARG_winsdk=10.0.16299.0 -set VSCMD_VER=15.0 -set VSINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\ -set Path=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\bin\HostX86\arm;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\VC\VCPackages;C:\Program Files (x86)\Microsoft Visual Studio\2017\Build Tools\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\bin\Roslyn;C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\arm;C:\Program Files (x86)\Windows Kits\10\bin\arm;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\\MSBuild\15.0\bin;C:\Windows\Microsoft.NET\Framework\ v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\Tools\;C:\Program Files\Python37\Scripts\;C:\Program Files\Python37\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\ProgramData\chocolatey\bin;C:\Program Files\OpenSSH-Win64;C:\Program Files\Git\cmd;C:\Windows\system32\config\systemprofile\AppData\Local\Microsoft\WindowsApps;C:\Users\user\AppData\Local\Microsoft\WindowsApps; -set INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\include;C:\Program Files (x86)\Windows Kits\10\include\10.0.16299.0\ucrt;C:\Program Files (x86)\Windows Kits\10\include\10.0.16299.0\shared;C:\Program Files (x86)\Windows Kits\10\include\10.0.16299.0\um;C:\Program Files (x86)\Windows Kits\10\include\10.0.16299.0\winrt;C:\Program Files (x86)\Windows Kits\10\include\10.0.16299.0\cppwinrt -set LIB=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\lib\arm\store\;C:\Program Files (x86)\Windows Kits\10\lib\10.0.16299.0\ucrt\arm;C:\Program Files (x86)\Windows Kits\10\lib\10.0.16299.0\um\arm; -set LIBPATH=C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs\Microsoft.VCLibs\14.0\References\CommonConfiguration\neutral;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\lib\arm\store\references;C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.16299.0;C:\Program Files (x86)\Windows Kits\10\References\10.0.16299.0;C:\Windows\Microsoft.NET\Framework\v4.0.30319; -set WindowsLibPath=C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.16299.0;C:\Program Files (x86)\Windows Kits\10\References\10.0.16299.0 -set WindowsSdkBinPath=C:\Program Files (x86)\Windows Kits\10\bin\ -set WindowsSdkDir=C:\Program Files (x86)\Windows Kits\10\ -set WindowsSDKLibVersion=10.0.16299.0\ -set WindowsSdkVerBinPath=C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\ -set WindowsSDKVersion=10.0.16299.0\ diff --git a/build-uwp/env-x64.bat b/build-uwp/env-x64.bat deleted file mode 100755 index fa2867f..0000000 --- a/build-uwp/env-x64.bat +++ /dev/null @@ -1,35 +0,0 @@ -set ALLUSERSPROFILE=C:\ProgramData -set CommandPromptType=Native -set CommonProgramFiles=C:\Program Files\Common Files -set CommonProgramFiles(x86)=C:\Program Files (x86)\Common Files -set CommonProgramW6432=C:\Program Files\Common Files -set DevEnvDir=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\ -set ExtensionSdkDir=C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs -set Framework40Version=v4.0 -set FrameworkDir=C:\Windows\Microsoft.NET\Framework64\ -set FrameworkDir64=C:\Windows\Microsoft.NET\Framework64\ -set FrameworkVersion=v4.0.30319 -set FrameworkVersion64=v4.0.30319 -set VCIDEInstallDir=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\VC\ -set VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\ -set VCToolsInstallDir=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\ -set VCToolsRedistDir=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Redist\MSVC\14.16.27012\ -set VCToolsVersion=14.16.27023 -set VisualStudioVersion=15.0 -set VS150COMNTOOLS=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\Tools\ -set VSCMD_ARG_app_plat=UWP -set VSCMD_ARG_HOST_ARCH=x86 -set VSCMD_ARG_TGT_ARCH=x64 -set VSCMD_ARG_winsdk=10.0.16299.0 -set VSCMD_VER=15.0 -set VSINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\ -set Path=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\bin\HostX86\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\VC\VCPackages;C:\Program Files (x86)\Microsoft Visual Studio\2017\Build Tools\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\bin\Roslyn;C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64;C:\Program Files (x86)\Windows Kits\10\bin\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\\MSBuild\15.0\bin;C:\Windows\Microsoft.NET\Framework\ v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\Tools\;C:\Program Files\Python37\Scripts\;C:\Program Files\Python37\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\ProgramData\chocolatey\bin;C:\Program Files\OpenSSH-Win64;C:\Program Files\Git\cmd;C:\Windows\system32\config\systemprofile\AppData\Local\Microsoft\WindowsApps;C:\Users\user\AppData\Local\Microsoft\WindowsApps; -set INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\include;C:\Program Files (x86)\Windows Kits\10\include\10.0.16299.0\ucrt;C:\Program Files (x86)\Windows Kits\10\include\10.0.16299.0\shared;C:\Program Files (x86)\Windows Kits\10\include\10.0.16299.0\um;C:\Program Files (x86)\Windows Kits\10\include\10.0.16299.0\winrt;C:\Program Files (x86)\Windows Kits\10\include\10.0.16299.0\cppwinrt -set LIB=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\lib\x64\store\;C:\Program Files (x86)\Windows Kits\10\lib\10.0.16299.0\ucrt\x64;C:\Program Files (x86)\Windows Kits\10\lib\10.0.16299.0\um\x64; -set LIBPATH=C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs\Microsoft.VCLibs\14.0\References\CommonConfiguration\neutral;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\lib\x64\store\references;C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.16299.0;C:\Program Files (x86)\Windows Kits\10\References\10.0.16299.0;C:\Windows\Microsoft.NET\Framework\v4.0.30319; -set WindowsLibPath=C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.16299.0;C:\Program Files (x86)\Windows Kits\10\References\10.0.16299.0 -set WindowsSdkBinPath=C:\Program Files (x86)\Windows Kits\10\bin\ -set WindowsSdkDir=C:\Program Files (x86)\Windows Kits\10\ -set WindowsSDKLibVersion=10.0.16299.0\ -set WindowsSdkVerBinPath=C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\ -set WindowsSDKVersion=10.0.16299.0\ diff --git a/build-uwp/env-x86.bat b/build-uwp/env-x86.bat deleted file mode 100755 index 9bbd1c3..0000000 --- a/build-uwp/env-x86.bat +++ /dev/null @@ -1,36 +0,0 @@ -set ALLUSERSPROFILE=C:\ProgramData -set CommandPromptType=Native -set CommonProgramFiles=C:\Program Files\Common Files -set CommonProgramFiles(x86)=C:\Program Files (x86)\Common Files -set CommonProgramW6432=C:\Program Files\Common Files -set DevEnvDir=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\ -set ExtensionSdkDir=C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs -set Framework40Version=v4.0 -set FrameworkDir=C:\Windows\Microsoft.NET\Framework64\ -set FrameworkDir64=C:\Windows\Microsoft.NET\Framework64\ -set FrameworkVersion=v4.0.30319 -set FrameworkVersion64=v4.0.30319 -set VCIDEInstallDir=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\VC\ -set VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\ -set VCToolsInstallDir=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\ -set VCToolsRedistDir=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Redist\MSVC\14.16.27012\ -set VCToolsVersion=14.16.27023 -set VisualStudioVersion=15.0 -set VS150COMNTOOLS=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\Tools\ -set VSCMD_ARG_app_plat=UWP -set VSCMD_ARG_HOST_ARCH=x86 -set VSCMD_ARG_TGT_ARCH=x86 -set VSCMD_ARG_winsdk=10.0.16299.0 -set VSCMD_VER=15.0 -set VSINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\ -set Path=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\bin\HostX86\x86;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\VC\VCPackages;C:\Program Files (x86)\Microsoft Visual Studio\2017\Build Tools\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\bin\Roslyn;C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x86;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\\MSBuild\15.0\bin;C:\Windows\Microsoft.NET\Framework\ v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\Tools\;C:\Program Files\Python37\Scripts\;C:\Program Files\Python37\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\ProgramData\chocolatey\bin;C:\Program Files\OpenSSH-Win64;C:\Program Files\Git\cmd;C:\Windows\system32\config\systemprofile\AppData\Local\Microsoft\WindowsApps;C:\Users\user\AppData\Local\Microsoft\WindowsApps; -set INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\include;C:\Program Files (x86)\Windows Kits\10\include\10.0.16299.0\ucrt;C:\Program Files (x86)\Windows Kits\10\include\10.0.16299.0\shared;C:\Program Files (x86)\Windows Kits\10\include\10.0.16299.0\um;C:\Program Files (x86)\Windows Kits\10\include\10.0.16299.0\winrt;C:\Program Files (x86)\Windows Kits\10\include\10.0.16299.0\cppwinrt -set LIB=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\lib\x86\store\;C:\Program Files (x86)\Windows Kits\10\lib\10.0.16299.0\ucrt\x86;C:\Program Files (x86)\Windows Kits\10\lib\10.0.16299.0\um\x86; -set LIBPATH=C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs\Microsoft.VCLibs\14.0\References\CommonConfiguration\neutral;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.16.27023\lib\x86\store\references;C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.16299.0;C:\Program Files (x86)\Windows Kits\10\References\10.0.16299.0;C:\Windows\Microsoft.NET\Framework\v4.0.30319; -set WindowsLibPath=C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.16299.0;C:\Program Files (x86)\Windows Kits\10\References\10.0.16299.0 -set WindowsSdkBinPath=C:\Program Files (x86)\Windows Kits\10\bin\ -set WindowsSdkDir=C:\Program Files (x86)\Windows Kits\10\ -set WindowsSDKLibVersion=10.0.16299.0\ -set WindowsSdkVerBinPath=C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\ -set WindowsSDKVersion=10.0.16299.0\ - diff --git a/build.sh b/build.sh index 9e726b2..65b7ffc 100755 --- a/build.sh +++ b/build.sh @@ -85,10 +85,6 @@ done export podman=${PODMAN} -if [ $UID != 0 ]; then - echo "WARNING: Running as non-root may cause problems for the uwp build" -fi - if [ -z "${godot_version}" ]; then echo "-v is mandatory!" exit 1 @@ -124,7 +120,7 @@ if [ $skip_download == 0 ]; then if [ ! -z "${logged_in}" ]; then echo "Fetching private images" - for image in macosx android ios uwp; do + for image in macosx android ios; do if [ ${force_download} == 1 ] || ! ${podman} image exists godot-private/$image; then if ! ${podman} pull ${registry}/godot-private/${image}; then 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: mkdir -p ${basedir}/out/ios ${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 -#mkdir -p ${basedir}/out/uwp -#${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 - if [ ! -z "$SUDO_UID" ]; then chown -R "${SUDO_UID}":"${SUDO_GID}" ${basedir}/git ${basedir}/out ${basedir}/mono-glue ${basedir}/godot*.tar.gz fi