Skip to content

Commit 996b4a8

Browse files
authored
Prepare for introducing swift-foundation into the toolchain (#74019) (#74108)
1 parent 9471cfd commit 996b4a8

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
@@ -1255,10 +1255,13 @@ STRESSTEST_PACKAGE_DIR="${WORKSPACE}/swift-stress-tester"
12551255
XCTEST_SOURCE_DIR="${WORKSPACE}/swift-corelibs-xctest"
12561256
FOUNDATION_SOURCE_DIR="${WORKSPACE}/swift-corelibs-foundation"
12571257
FOUNDATION_STATIC_SOURCE_DIR="${WORKSPACE}/swift-corelibs-foundation"
1258+
FOUNDATION_SWIFTFOUNDATION_SOURCE_DIR="${WORKSPACE}/swift-foundation"
1259+
FOUNDATION_SWIFTFOUNDATIONICU_SOURCE_DIR="${WORKSPACE}/swift-foundation-icu"
12581260
LIBDISPATCH_SOURCE_DIR="${WORKSPACE}/swift-corelibs-libdispatch"
12591261
LIBDISPATCH_STATIC_SOURCE_DIR="${WORKSPACE}/swift-corelibs-libdispatch"
12601262
LIBICU_SOURCE_DIR="${WORKSPACE}/icu"
12611263
LIBCXX_SOURCE_DIR="${WORKSPACE}/llvm-project/runtimes"
1264+
SWIFT_COLLECTIONS_SOURCE_DIR="${WORKSPACE}/swift-collections"
12621265
SWIFT_PATH_TO_STRING_PROCESSING_SOURCE="${WORKSPACE}/swift-experimental-string-processing"
12631266
SWIFTSYNTAX_SOURCE_DIR="${WORKSPACE}/swift-syntax"
12641267
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
@@ -37,7 +37,11 @@
3737
"swift-corelibs-xctest": {
3838
"remote": { "id": "apple/swift-corelibs-xctest" } },
3939
"swift-corelibs-foundation": {
40-
"remote": { "id": "apple/swift-corelibs-foundation" } },
40+
"remote": { "id": "apple/swift-corelibs-foundation" } },
41+
"swift-foundation-icu": {
42+
"remote": { "id": "apple/swift-foundation-icu" } },
43+
"swift-foundation": {
44+
"remote": { "id": "apple/swift-foundation" } },
4145
"swift-corelibs-libdispatch": {
4246
"remote": { "id": "apple/swift-corelibs-libdispatch" } },
4347
"swift-integration-tests": {
@@ -126,6 +130,8 @@
126130
"swift-stress-tester": "main",
127131
"swift-corelibs-xctest": "main",
128132
"swift-corelibs-foundation": "main",
133+
"swift-foundation-icu": "main",
134+
"swift-foundation": "main",
129135
"swift-corelibs-libdispatch": "main",
130136
"swift-integration-tests": "main",
131137
"swift-xcode-playground-support": "main",

0 commit comments

Comments
 (0)