Android: Install platform30 manually

Just because I didn't feel like rebuild the Android container used for 3.3.

.gitignore

@@ -4,9 +4,10 @@ config.sh
 
 # Generated by build scripts
 angle/
+deps/
 git/
 mono-glue/
-godot.tar.gz
+godot*.tar.gz
 angle.7z
 
 # Output

build-android/build.sh

@@ -9,6 +9,8 @@ export OPTIONS="production=yes"
 export OPTIONS_MONO="module_mono_enabled=yes mono_static=no"
 export TERM=xterm
 
+${ANDROID_SDK_ROOT}/cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" 'platforms;android-30'
+
 rm -rf godot
 mkdir godot
 cd godot

build-release.sh

@@ -156,7 +156,7 @@ mkdir -p ${templatesdir_mono}
 
 # Tarball
 
-zcat godot.tar.gz | xz -c > ${reldir}/godot-${godot_version}.tar.xz
+zcat godot-${godot_version}.tar.gz | xz -c > ${reldir}/godot-${godot_version}.tar.xz
 pushd ${reldir}
 sha256sum godot-${godot_version}.tar.xz > godot-${godot_version}.tar.xz.sha256
 popd
@@ -293,17 +293,19 @@ if [ "${build_classical}" == "1" ]; then
 
   ## UWP (Classical) ##
 
-  if [ ! -d "angle" ]; then
+  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 angle/winrt/10/src/Release_${arch}/libEGL.dll \
+    cp deps/angle/winrt/10/src/Release_${arch}/libEGL.dll \
-      angle/winrt/10/src/Release_${arch}/libGLESv2.dll \
+      deps/angle/winrt/10/src/Release_${arch}/libGLESv2.dll \
       uwp_template_${arch}/
     cp -r uwp_template_${arch} uwp_template_${arch}_debug
   done

build-uwp/build.sh

@@ -17,7 +17,7 @@ tar xf /root/godot.tar.gz --strip-components=1
 # Classical
 
 if [ "${CLASSICAL}" == "1" ]; then
-  echo "Starting classical build for Server..."
+  echo "Starting classical build for UWP..."
 
   for arch in ${BUILD_ARCHES}; do
     for release in release release_debug; do

build.sh

@@ -104,6 +104,16 @@ if [ -z "${godot_version}" ]; then
   exit 1
 fi
 
+IFS=- read version status <<< "$godot_version"
+echo "Building Godot ${version} ${status} from commit or branch ${git_treeish}."
+read -p "Is this correct (y/n)? " choice
+case "$choice" in
+  y|Y ) echo "yes";;
+  n|N ) echo "No, aborting."; exit 0;;
+  * ) echo "Invalid choice, aborting."; exit 1;;
+esac
+export GODOT_VERSION_STATUS="${status}"
+
 if [ ! -z "${username}" ] && [ ! -z "${password}" ]; then
   if ${podman} login ${registry} -u "${username}" -p "${password}"; then
     export logged_in=true
@@ -147,18 +157,18 @@ if [ "${skip_git_checkout}" == 0 ]; then
   correct_version=$(python3 << EOF
 import version;
 if hasattr(version, "patch") and version.patch != 0:
-  git_version = f"{version.major}.{version.minor}.{version.patch}-{version.status}"
+  git_version = f"{version.major}.{version.minor}.{version.patch}"
 else:
-  git_version = f"{version.major}.{version.minor}-{version.status}"
+  git_version = f"{version.major}.{version.minor}"
-print(git_version == "${godot_version}")
+print(git_version == "${version}")
 EOF
   )
   if [[ "$correct_version" != "True" ]]; then
-    echo "Version in version.py doesn't match the passed ${godot_version}."
+    echo "Version in version.py doesn't match the passed ${version}."
-    exit 0
+    exit 1
   fi
 
-  git archive --format=tar $git_treeish --prefix=godot-${godot_version}/ | gzip > ../godot.tar.gz
+  sh misc/scripts/make_tarball.sh -v ${godot_version} -g ${git_treeish}
   popd
 fi
 
@@ -166,7 +176,7 @@ export basedir="$(pwd)"
 mkdir -p ${basedir}/out
 mkdir -p ${basedir}/out/logs
 
-export podman_run="${podman} run -it --rm --env BUILD_NAME --env NUM_CORES --env CLASSICAL=${build_classical} --env MONO=${build_mono} -v ${basedir}/godot.tar.gz:/root/godot.tar.gz -v ${basedir}/mono-glue:/root/mono-glue -w /root/"
+export podman_run="${podman} run -it --rm --env BUILD_NAME --env GODOT_VERSION_STATUS --env NUM_CORES --env CLASSICAL=${build_classical} --env MONO=${build_mono} -v ${basedir}/godot-${godot_version}.tar.gz:/root/godot.tar.gz -v ${basedir}/mono-glue:/root/mono-glue -w /root/"
 export img_version=3.x-mono-6.12.0.122
 
 # Get AOT compilers from their containers.
@@ -205,5 +215,5 @@ 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}/out ${basedir}/mono-glue ${basedir}/godot.tar.gz
+  chown -R "${SUDO_UID}":"${SUDO_GID}" ${basedir}/git ${basedir}/out ${basedir}/mono-glue ${basedir}/godot*.tar.gz
 fi