Author: marcprux

swift-ci/sdks/android/build-local

@@ -52,8 +52,6 @@ fi
 mkdir -p ${SDKROOT}/products
 
 ./scripts/fetch-source.sh --source-dir ${SDKROOT}/src --swift-tag ${SWIFT_TAG}
-
 ./scripts/patch-sources.sh ${SDKROOT}/src
 
 ./scripts/build.sh --products-dir ${SDKROOT}/products --source-dir ${SDKROOT}/src --build-dir ${SDKROOT}/build --ndk-home ${ANDROID_NDK_HOME} --android-api ${ANDROID_API} --host-toolchain ${HOST_TOOLCHAIN} --archs ${TARGET_ARCHS} ${@}
-

swift-ci/sdks/android/scripts/patch-sources.sh

@@ -18,11 +18,6 @@ if [[ ! -d "${patches_dir}" ]]; then
     exit 1
 fi
 
-if [[ "${BUILD_VERSION}" == "" ]]; then
-    echo "$0: BUILD_VERSION environment is not set"
-    exit 1
-fi
-
 cd ${source_dir}/swift-project
 swift_android_patch="${patches_dir}/swift-android.patch"
 
@@ -33,13 +28,28 @@ perl -pi -e 's/#if os\(Windows\)/#if os\(Android\)/g' $swift_android_patch
 # remove the need to link in android-execinfo
 perl -pi -e 's/dispatch android-execinfo/dispatch/g' $swift_android_patch
 
-if [ "${BUILD_VERSION}" = 'release' ]; then
-    testing_patch="${patches_dir}/swift-android-testing-release.patch"
-else
-    testing_patch="${patches_dir}/swift-android-testing-except-release.patch"
-fi
+case "${BUILD_VERSION}" in
+    release)
+        testing_patch="${patches_dir}/swift-android-testing-release.patch"
+        ;;
+    devel)
+        testing_patch="${patches_dir}/swift-android-testing-except-release.patch"
+        ;;
+    trunk)
+        testing_patch="${patches_dir}/swift-android-testing-except-release.patch"
+        dispatch_patch="${patches_dir}/swift-android-trunk-libdispatch.patch"
+        ;;
+    *)
+        echo "$0: invalid BUILD_VERSION=${BUILD_VERSION}"
+        exit 1
+        ;;
+esac
+
+for patch in "$swift_android_patch" "$testing_patch" "$dispatch_patch"; do
+    if [[ "${patch}" == "" ]]; then
+        continue
+    fi
 
-for patch in "$swift_android_patch" "$testing_patch"; do
     echo "applying patch $patch in $PWD…"
 
     if git apply -C1 --reverse --check "$patch" >/dev/null 2>&1 ; then
@@ -59,4 +69,3 @@ perl -pi -e 's/os\(Android\)/os\(AndroidDISABLED\)/g' swift-testing/Sources/Test
 # need to un-apply libandroid-spawn since we don't need it for API28+
 perl -pi -e 's/MATCHES "Android"/MATCHES "AndroidDISABLED"/g' llbuild/lib/llvm/Support/CMakeLists.txt
 perl -pi -e 's/ STREQUAL Android\)/ STREQUAL AndroidDISABLED\)/g' swift-corelibs-foundation/Sources/Foundation/CMakeLists.txt
-

swift-ci/sdks/android/scripts/toolchain-vars.sh

@@ -1,18 +1,35 @@
 #!/bin/bash -e
+#
+# ===----------------------------------------------------------------------===
+#
+#  Swift Android SDK: Toolchain source variables
+#
+# ===----------------------------------------------------------------------===
+
+# This script is meant to be sourced from another script that sets the
+# BUILD_VERSION environment variable to one of "release", "devel", or "trunk"
+# and will set check the latest builds for each build type in order
+# to provide information about the Swift tag name in use and where to
+# obtain the latest toolchain for building.
+
+# TODO: we could instead use the latest-build.yml files for this, like:
+# https://download.swift.org/swift-6.2-branch/ubuntu2404/latest-build.yml
+# https://download.swift.org/development/ubuntu2404/latest-build.yml
+# but there doesn't seem to be one for the current release build.
 
 case "${BUILD_VERSION}" in
     release)
-        LATEST_TOOLCHAIN_VERSION=$(curl -sL https://github.com/apple/swift/releases | grep -m1 swift-6.1 | cut -d- -f2)
+        LATEST_TOOLCHAIN_VERSION=$(curl -sL https://github.com/swiftlang/swift/releases | grep -m1 swift-6.1 | cut -d- -f2)
         SWIFT_TAG="swift-${LATEST_TOOLCHAIN_VERSION}-RELEASE"
         SWIFT_BRANCH="swift-$(echo $SWIFT_TAG | cut -d- -f2)-release"
         ;;
     devel)
-        LATEST_TOOLCHAIN_VERSION=$(curl -sL https://github.com/apple/swift/tags | grep -m1 swift-6.2-DEV | cut -d- -f8-10)
+        LATEST_TOOLCHAIN_VERSION=$(curl -sL https://github.com/swiftlang/swift/tags | grep -m1 swift-6.2-DEV | cut -d- -f8-10)
         SWIFT_TAG="swift-6.2-DEVELOPMENT-SNAPSHOT-${LATEST_TOOLCHAIN_VERSION}-a"
         SWIFT_BRANCH="swift-$(echo $SWIFT_TAG | cut -d- -f2)-branch"
         ;;
     trunk)
-        LATEST_TOOLCHAIN_VERSION=$(curl -sL https://github.com/apple/swift/tags | grep -m1 swift-DEV | cut -d- -f7-9)
+        LATEST_TOOLCHAIN_VERSION=$(curl -sL https://github.com/swiftlang/swift/tags | grep -m1 swift-DEV | cut -d- -f7-9)
         SWIFT_TAG="swift-DEVELOPMENT-SNAPSHOT-${LATEST_TOOLCHAIN_VERSION}-a"
         SWIFT_BRANCH="development"
         ;;