[macOS] Use notarytool instead of deprecated altool.

(cherry picked from commit 7b9e4271f4)

build-release.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -e
+export basedir=$(pwd)
 
 # Config
 
@@ -48,12 +49,11 @@ sign_macos() {
               -s ${OSX_KEY_ID} -v ${_appname} && \
             zip -r ${_binname}_signed.zip ${_appname}"
 
-  _request_uuid=$(ssh "${OSX_HOST}" "xcrun altool --notarize-app --primary-bundle-id \"${OSX_BUNDLE_ID}\" --username \"${APPLE_ID}\" --password \"${APPLE_ID_PASSWORD}\" --file ${_macos_tmpdir}/${_binname}_signed.zip")
-  _request_uuid=$(echo ${_request_uuid} | sed -e 's/.*RequestUUID = //')
-  ssh "${OSX_HOST}" "while xcrun altool --notarization-info ${_request_uuid} -u \"${APPLE_ID}\" -p \"${APPLE_ID_PASSWORD}\" | grep -q Status:\ in\ progress; do echo Waiting on Apple notarization...; sleep 30s; done"
-  if ! ssh "${OSX_HOST}" "xcrun altool --notarization-info ${_request_uuid} -u \"${APPLE_ID}\" -p \"${APPLE_ID_PASSWORD}\" | grep -q Status:\ success"; then
+  _request_uuid=$(ssh "${OSX_HOST}" "xcrun notarytool submit ${_macos_tmpdir}/${_binname}_signed.zip --team-id \"${APPLE_TEAM}\" --apple-id \"${APPLE_ID}\" --password \"${APPLE_ID_PASSWORD}\" --no-progress --output-format json")
+  _request_uuid=$(echo ${_request_uuid} | sed -e 's/.*"id":"\([^"]*\)".*/\1/')
+  if ! ssh "${OSX_HOST}" "xcrun notarytool wait ${_request_uuid} --team-id \"${APPLE_TEAM}\" --apple-id \"${APPLE_ID}\" --password \"${APPLE_ID_PASSWORD}\" | grep -q status:\ Accepted"; then
     echo "Notarization failed."
-    _notarization_log=$(ssh "${OSX_HOST}" "xcrun altool --notarization-info ${_request_uuid} -u \"${APPLE_ID}\" -p \"${APPLE_ID_PASSWORD}\"")
+    _notarization_log=$(ssh "${OSX_HOST}" "xcrun notarytool log ${_request_uuid} --team-id \"${APPLE_TEAM}\" --apple-id \"${APPLE_ID}\" --password \"${APPLE_ID_PASSWORD}\"")
     echo "${_notarization_log}"
     ssh "${OSX_HOST}" "rm -rf ${_macos_tmpdir}"
     exit 1
@@ -104,6 +104,21 @@ publish_nuget_packages() {
   done
 }
 
+can_publish_maven=0
+if [ ! -d "${basedir}/deps/keystore" ]; then
+  echo "Disabling Android library publishing as ${basedir}/deps/keystore doesn't exist."
+else
+  can_publish_maven=1
+fi
+
+publish_maven_library() {
+  if [ $can_publish_maven == 0 ]; then
+    return
+  fi
+  # FIXME: Might be worth reworking the script to make it all sudo-safe and use appropriate users throughout.
+  sudo sh build-android/upload-mavencentral.sh
+}
+
 godot_version=""
 templates_version=""
 do_cleanup=1
@@ -111,8 +126,9 @@ make_tarball=1
 build_classical=1
 build_mono=1
 publish_nuget=0
+publish_maven=0
 
-while getopts "h?v:t:b:n-:" opt; do
+while getopts "h?v:t:b:p:n-:" opt; do
   case "$opt" in
   h|\?)
     echo "Usage: $0 [OPTIONS...]"
@@ -120,7 +136,7 @@ while getopts "h?v:t:b:n-:" opt; do
     echo "  -v godot version (e.g: 3.2-stable) [mandatory]"
     echo "  -t templates version (e.g. 3.2.stable) [mandatory]"
     echo "  -b build target: all|classical|mono|none (default: all)"
-    echo "  -n publish nuget packages (default: false)"
+    echo "  -p publish target: all|nuget|maven|none (default: none)"
     echo "  --no-cleanup disable deleting pre-existing output folders (default: false)"
     echo "  --no-tarball disable generating source tarball (default: false)"
     echo
@@ -142,8 +158,15 @@ while getopts "h?v:t:b:n-:" opt; do
       build_mono=0
     fi
     ;;
-  n)
-    publish_nuget=1
+  p)
+    if [ "$OPTARG" == "nuget" ]; then
+      publish_nuget=1
+    elif [ "$OPTARG" == "maven" ]; then
+      publish_maven=1
+    elif [ "$OPTARG" == "all" ]; then
+      publish_nuget=1
+      publish_maven=1
+    fi
     ;;
   -)
     case "${OPTARG}" in
@@ -172,7 +195,6 @@ elif [[ "{$templates_version}" == *"-"* ]]; then
   exit 1
 fi
 
-export basedir=$(pwd)
 export webdir="${basedir}/web/${templates_version}"
 export reldir="${basedir}/releases/${godot_version}"
 export reldir_mono="${reldir}/mono"
@@ -341,43 +363,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
@@ -552,4 +537,13 @@ if [ "${publish_nuget}" == "1" ]; then
 
 fi
 
+# Godot Android library
+
+if [ "${publish_maven}" == "1" ]; then
+
+  echo "Publishing Android library to MavenCentral..."
+  publish_maven_library
+
+fi
+
 echo "All editor binaries and templates prepared successfully for release"

build-uwp/build.bat

@@ -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\""

build-uwp/build.sh

@@ -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"

build-uwp/env-arm.bat

@@ -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\

build-uwp/env-x64.bat

@@ -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\

build-uwp/env-x86.bat

@@ -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\
-

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 <version> 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

clean-release.sh

@@ -1,2 +1,3 @@
-rm -rf releases tmp web
+#!/bin/bash
 
+rm -rf releases tmp web

clean.sh

@@ -1,2 +1,4 @@
+#!/bin/bash
+
 rm -rf godot*.tar.gz mono-glue out releases tmp web
 git status

config.sh.in

@@ -50,7 +50,8 @@ export OSX_HOST=''
 export OSX_KEY_ID=''
 # Bundle id for the signed app
 export OSX_BUNDLE_ID=''
-# Username/password for Apple's signing APIs (used for atltool)
+# Username/password for Apple's signing APIs (used for notarytool)
+export APPLE_TEAM=''
 export APPLE_ID=''
 export APPLE_ID_PASSWORD=''