Skip to content

Commit 025c976

Browse files
authored
Prepare for introducing swift-foundation into the toolchain (#74019)
1 parent 228e425 commit 025c976

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

utils/build-script-impl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1245,10 +1245,13 @@ STRESSTEST_PACKAGE_DIR="${WORKSPACE}/swift-stress-tester"
12451245
XCTEST_SOURCE_DIR="${WORKSPACE}/swift-corelibs-xctest"
12461246
FOUNDATION_SOURCE_DIR="${WORKSPACE}/swift-corelibs-foundation"
12471247
FOUNDATION_STATIC_SOURCE_DIR="${WORKSPACE}/swift-corelibs-foundation"
1248+
FOUNDATION_SWIFTFOUNDATION_SOURCE_DIR="${WORKSPACE}/swift-foundation"
1249+
FOUNDATION_SWIFTFOUNDATIONICU_SOURCE_DIR="${WORKSPACE}/swift-foundation-icu"
12481250
LIBDISPATCH_SOURCE_DIR="${WORKSPACE}/swift-corelibs-libdispatch"
12491251
LIBDISPATCH_STATIC_SOURCE_DIR="${WORKSPACE}/swift-corelibs-libdispatch"
12501252
LIBICU_SOURCE_DIR="${WORKSPACE}/icu"
12511253
LIBCXX_SOURCE_DIR="${WORKSPACE}/llvm-project/runtimes"
1254+
SWIFT_COLLECTIONS_SOURCE_DIR="${WORKSPACE}/swift-collections"
12521255
SWIFT_PATH_TO_STRING_PROCESSING_SOURCE="${WORKSPACE}/swift-experimental-string-processing"
12531256
SWIFTSYNTAX_SOURCE_DIR="${WORKSPACE}/swift-syntax"
12541257
SWIFT_SYNTAX_SOURCE_DIR="${WORKSPACE}/swift-syntax"
@@ -2531,6 +2534,12 @@ for host in "${ALL_HOSTS[@]}"; do
25312534
-DFOUNDATION_PATH_TO_LIBDISPATCH_BUILD=$(build_directory ${host} libdispatch)
25322535
-Ddispatch_DIR=$(build_directory ${host} libdispatch)/cmake/modules
25332536

2537+
-DSwiftSyntax_DIR=$(build_directory ${host} swift)/cmake/modules
2538+
2539+
-D_SwiftFoundation_SourceDIR=${FOUNDATION_SWIFTFOUNDATION_SOURCE_DIR}
2540+
-D_SwiftFoundationICU_SourceDIR=${FOUNDATION_SWIFTFOUNDATIONICU_SOURCE_DIR}
2541+
-D_SwiftCollections_SourceDIR=${SWIFT_COLLECTIONS_SOURCE_DIR}
2542+
25342543
# NOTE(compnerd) we disable tests because XCTest is not ready
25352544
# yet, but we will reconfigure when the time comes.
25362545
-DENABLE_TESTING:BOOL=NO

utils/update_checkout/update-checkout-config.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,11 @@
4141
"swift-corelibs-xctest": {
4242
"remote": { "id": "apple/swift-corelibs-xctest" } },
4343
"swift-corelibs-foundation": {
44-
"remote": { "id": "apple/swift-corelibs-foundation" } },
44+
"remote": { "id": "apple/swift-corelibs-foundation" } },
45+
"swift-foundation-icu": {
46+
"remote": { "id": "apple/swift-foundation-icu" } },
47+
"swift-foundation": {
48+
"remote": { "id": "apple/swift-foundation" } },
4549
"swift-corelibs-libdispatch": {
4650
"remote": { "id": "apple/swift-corelibs-libdispatch" } },
4751
"swift-integration-tests": {
@@ -134,6 +138,8 @@
134138
"swift-stress-tester": "main",
135139
"swift-corelibs-xctest": "main",
136140
"swift-corelibs-foundation": "main",
141+
"swift-foundation-icu": "main",
142+
"swift-foundation": "main",
137143
"swift-corelibs-libdispatch": "main",
138144
"swift-integration-tests": "main",
139145
"swift-xcode-playground-support": "main",

0 commit comments

Comments
 (0)