Reduce workarounds, install everything to staging_dir at end

build-dispatch.sh

@@ -33,5 +33,3 @@ echo "Build Dispatch"
 echo "Install Dispatch"
 (cd $LIBDISPATCH_BUILDDIR && ninja install)
 
-echo "Install Dispatch to sysroot"
-cp -rf ${LIBDISPATCH_INSTALL_PREFIX}/* ${STAGING_DIR}/usr/

build-foundation.sh

@@ -7,9 +7,6 @@ mkdir -p $FOUNDATION_BUILDDIR
 rm -rf $FOUNDATION_INSTALL_PREFIX
 mkdir -p $FOUNDATION_INSTALL_PREFIX
 
-# Workaround Dispatch defined with cmake and module
-rm -rf ${STAGING_DIR}/usr/lib/swift/dispatch
-
 echo "Configure Foundation"
 rm -rf $FOUNDATION_BUILDDIR/CMakeCache.txt
 LIBS="-latomic" cmake -S $FOUNDATION_SRCDIR -B $FOUNDATION_BUILDDIR -G Ninja \
@@ -48,9 +45,3 @@ echo "Build Foundation"
 
 echo "Install Foundation"
 (cd $FOUNDATION_BUILDDIR && ninja install)
-
-# Restore Dispatch headers
-cp -rf ${LIBDISPATCH_INSTALL_PREFIX}/* ${STAGING_DIR}/usr/
-
-echo "Install Foundation into sysroot"
-cp -rf ${FOUNDATION_INSTALL_PREFIX}/* ${STAGING_DIR}/usr/

build-swift-testing.sh

@@ -2,7 +2,7 @@
 set -e
 source swift-define
 
-echo "Create swift-testing build folder ${SWIFT_TESTING_BUILDDIR}"
+echo "Create Testing build folder ${SWIFT_TESTING_BUILDDIR}"
 mkdir -p $SWIFT_TESTING_BUILDDIR
 rm -rf $SWIFT_TESTING_INSTALL_PREFIX
 mkdir -p $SWIFT_TESTING_INSTALL_PREFIX
@@ -12,7 +12,7 @@ if [[ $SWIFT_VERSION == *"swift-6.1"* ]]; then
     SWIFTC_FLAGS="${SWIFTC_FLAGS} -D SWT_NO_EXIT_TESTS"
 fi
 
-echo "Configure swift-testing"
+echo "Configure Testing"
 rm -rf $SWIFT_TESTING_BUILDDIR/CMakeCache.txt
 LIBS="-latomic" cmake -S $SWIFT_TESTING_SRCDIR -B $SWIFT_TESTING_BUILDDIR -G Ninja \
     -DCMAKE_INSTALL_PREFIX=${SWIFT_TESTING_INSTALL_PREFIX} \
@@ -31,13 +31,12 @@ LIBS="-latomic" cmake -S $SWIFT_TESTING_SRCDIR -B $SWIFT_TESTING_BUILDDIR -G Nin
     -DCMAKE_Swift_FLAGS_DEBUG="" \
     -DCMAKE_Swift_FLAGS_RELEASE="" \
     -DCMAKE_Swift_FLAGS_RELWITHDEBINFO="" \
+    -Ddispatch_DIR="${LIBDISPATCH_BUILDDIR}/cmake/modules" \
+    -DFoundation_DIR="${FOUNDATION_BUILDDIR}/cmake/modules" \
     -DSwiftTesting_MACRO="${SWIFT_NATIVE_PATH}/../lib/swift/host/plugins/libTestingMacros.so" \
 
-echo "Build swift-testing"
+echo "Build Testing"
 (cd $SWIFT_TESTING_BUILDDIR && ninja)
 
-echo "Install swift-testing"
+echo "Install Testing"
 (cd $SWIFT_TESTING_BUILDDIR && ninja install)
-
-echo "Install Testing to sysroot"
-cp -rf ${SWIFT_TESTING_INSTALL_PREFIX}/* ${STAGING_DIR}/usr/

build-xctest.sh

@@ -7,9 +7,6 @@ mkdir -p $XCTEST_BUILDDIR
 rm -rf $XCTEST_INSTALL_PREFIX
 mkdir -p $XCTEST_INSTALL_PREFIX
 
-# Workaround Dispatch defined with cmake and module
-rm -rf ${STAGING_DIR}/usr/lib/swift/dispatch
-
 echo "Configure XCTest"
 rm -rf $XCTEST_BUILDDIR/CMakeCache.txt
 LIBS="-latomic" cmake -S $XCTEST_SRCDIR -B $XCTEST_BUILDDIR -G Ninja \
@@ -37,9 +34,3 @@ echo "Build XCTest"
 
 echo "Install XCTest"
 (cd $XCTEST_BUILDDIR && ninja install)
-
-# Restore Dispatch headers
-cp -rf ${LIBDISPATCH_INSTALL_PREFIX}/* ${STAGING_DIR}/usr/
-
-echo "Install XCTest to sysroot"
-cp -rf ${XCTEST_INSTALL_PREFIX}/* ${STAGING_DIR}/usr/

build.sh

@@ -40,6 +40,8 @@ if [[ $SWIFT_VERSION == *"swift-6."* ]] || [[ $SWIFT_VERSION == *"swift-DEVELOPM
     ./build-swift-testing.sh
 fi
 
+./deploy-to-sysroot.sh
+
 # Archive
 ./build-tar.sh
 

deploy-to-sysroot.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+set -e
+source swift-define
+
+echo "Install Dispatch to sysroot"
+cp -rf ${LIBDISPATCH_INSTALL_PREFIX}/* ${STAGING_DIR}/usr/
+
+echo "Install Foundation to sysroot"
+cp -rf ${FOUNDATION_INSTALL_PREFIX}/* ${STAGING_DIR}/usr/
+
+echo "Install XCTest to sysroot"
+cp -rf ${XCTEST_INSTALL_PREFIX}/* ${STAGING_DIR}/usr/
+
+if [ -d SWIFT_TESTING_INSTALL_PREFIX ]; then
+    echo "Install Testing to sysroot"
+    cp -rf ${SWIFT_TESTING_INSTALL_PREFIX}/* ${STAGING_DIR}/usr/
+fi