diff --git a/utils/build-script-impl b/utils/build-script-impl index 9beb8119ab079..b0e28a657f54d 100755 --- a/utils/build-script-impl +++ b/utils/build-script-impl @@ -1236,10 +1236,13 @@ STRESSTEST_PACKAGE_DIR="${WORKSPACE}/swift-stress-tester" XCTEST_SOURCE_DIR="${WORKSPACE}/swift-corelibs-xctest" FOUNDATION_SOURCE_DIR="${WORKSPACE}/swift-corelibs-foundation" FOUNDATION_STATIC_SOURCE_DIR="${WORKSPACE}/swift-corelibs-foundation" +FOUNDATION_SWIFTFOUNDATION_SOURCE_DIR="${WORKSPACE}/swift-foundation" +FOUNDATION_SWIFTFOUNDATIONICU_SOURCE_DIR="${WORKSPACE}/swift-foundation-icu" LIBDISPATCH_SOURCE_DIR="${WORKSPACE}/swift-corelibs-libdispatch" LIBDISPATCH_STATIC_SOURCE_DIR="${WORKSPACE}/swift-corelibs-libdispatch" LIBICU_SOURCE_DIR="${WORKSPACE}/icu" LIBCXX_SOURCE_DIR="${WORKSPACE}/llvm-project/runtimes" +SWIFT_COLLECTIONS_SOURCE_DIR="${WORKSPACE}/swift-collections" SWIFT_PATH_TO_STRING_PROCESSING_SOURCE="${WORKSPACE}/swift-experimental-string-processing" SWIFTSYNTAX_SOURCE_DIR="${WORKSPACE}/swift-syntax" SWIFT_SYNTAX_SOURCE_DIR="${WORKSPACE}/swift-syntax" @@ -2519,6 +2522,12 @@ for host in "${ALL_HOSTS[@]}"; do -DFOUNDATION_PATH_TO_LIBDISPATCH_BUILD=$(build_directory ${host} libdispatch) -Ddispatch_DIR=$(build_directory ${host} libdispatch)/cmake/modules + -DSwiftSyntax_DIR=$(build_directory ${host} swift)/cmake/modules + + -D_SwiftFoundation_SourceDIR=${FOUNDATION_SWIFTFOUNDATION_SOURCE_DIR} + -D_SwiftFoundationICU_SourceDIR=${FOUNDATION_SWIFTFOUNDATIONICU_SOURCE_DIR} + -D_SwiftCollections_SourceDIR=${SWIFT_COLLECTIONS_SOURCE_DIR} + # NOTE(compnerd) we disable tests because XCTest is not ready # yet, but we will reconfigure when the time comes. -DENABLE_TESTING:BOOL=NO diff --git a/utils/update_checkout/update-checkout-config.json b/utils/update_checkout/update-checkout-config.json index 4630ac262f944..117b64df994ed 100644 --- a/utils/update_checkout/update-checkout-config.json +++ b/utils/update_checkout/update-checkout-config.json @@ -41,7 +41,11 @@ "swift-corelibs-xctest": { "remote": { "id": "apple/swift-corelibs-xctest" } }, "swift-corelibs-foundation": { - "remote": { "id": "apple/swift-corelibs-foundation" } }, + "remote": { "id": "apple/swift-corelibs-foundation" } }, + "swift-foundation-icu": { + "remote": { "id": "apple/swift-foundation-icu" } }, + "swift-foundation": { + "remote": { "id": "apple/swift-foundation" } }, "swift-corelibs-libdispatch": { "remote": { "id": "apple/swift-corelibs-libdispatch" } }, "swift-integration-tests": { @@ -121,7 +125,7 @@ "swiftpm": "main", "swift-argument-parser": "1.2.3", "swift-atomics": "1.2.0", - "swift-collections": "1.0.5", + "swift-collections": "1.1.0", "swift-crypto": "3.0.0", "swift-certificates": "1.0.1", "swift-asn1": "1.0.0", @@ -134,6 +138,8 @@ "swift-stress-tester": "main", "swift-corelibs-xctest": "main", "swift-corelibs-foundation": "main", + "swift-foundation-icu": "main", + "swift-foundation": "main", "swift-corelibs-libdispatch": "main", "swift-integration-tests": "main", "swift-xcode-playground-support": "main",