Skip to content

Commit 42e1cb7

Browse files
committed
Break SwiftRemoteMirror into its own target.
We want to be able to build a target with just the platform-specific libswiftRemoteMirror library. This should be a change in build logic for existing presets but allows for a separate preset to be defined that just builds the library if/when it's necessary. - Add --build-swift-remote-mirror option to build-script-impl - Add swift-remote-mirror known install component. - Only add SwiftRemoteMirror targets if SWIFT_BUILD_REMOTE_MIRROR is on. - Move libswiftRemoteMirror into the swift-remote-mirror install component. - Add swift-remote-mirror install components to existing presets. rdar://problem/27085666
1 parent 8df67c9 commit 42e1cb7

File tree

5 files changed

+15
-6
lines changed

5 files changed

+15
-6
lines changed

CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ option(SWIFT_BUILD_TOOLS
4848
"Build the Swift compiler and other tools"
4949
TRUE)
5050

51+
option(SWIFT_BUILD_REMOTE_MIRROR
52+
"Build the Swift Remote Mirror Library"
53+
TRUE)
54+
5155
option(SWIFT_BUILD_DYNAMIC_STDLIB
5256
"Build dynamic variants of the Swift standard library"
5357
TRUE)
@@ -120,7 +124,7 @@ set(SWIFT_ENABLE_GOLD_LINKER FALSE CACHE BOOL
120124
"Enable using the gold linker when available")
121125

122126
set(_SWIFT_KNOWN_INSTALL_COMPONENTS
123-
"autolink-driver;compiler;clang-builtin-headers;clang-resource-dir-symlink;clang-builtin-headers-in-clang-resource-dir;stdlib;stdlib-experimental;sdk-overlay;editor-integration;tools;testsuite-tools;toolchain-dev-tools;dev;license;sourcekit-xpc-service;sourcekit-inproc;swift-remote-mirror-headers")
127+
"autolink-driver;compiler;clang-builtin-headers;clang-resource-dir-symlink;clang-builtin-headers-in-clang-resource-dir;stdlib;stdlib-experimental;sdk-overlay;editor-integration;tools;testsuite-tools;toolchain-dev-tools;dev;license;sourcekit-xpc-service;sourcekit-inproc;swift-remote-mirror;swift-remote-mirror-headers")
124128

125129
# Set the SWIFT_INSTALL_COMPONENTS variable to the default value if it is not passed in via -D
126130
set(SWIFT_INSTALL_COMPONENTS "${_SWIFT_KNOWN_INSTALL_COMPONENTS}" CACHE STRING

stdlib/public/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ if(SWIFT_BUILD_STDLIB)
3131
add_subdirectory(stubs)
3232
add_subdirectory(core)
3333
add_subdirectory(SwiftOnoneSupport)
34+
endif()
35+
36+
if(SWIFT_BUILD_STDLIB OR SWIFT_BUILD_REMOTE_MIRROR)
3437
add_subdirectory(Reflection)
3538
add_subdirectory(SwiftRemoteMirror)
3639
endif()

stdlib/public/SwiftRemoteMirror/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ if(SWIFT_BUILD_DYNAMIC_STDLIB)
44
add_swift_library(swiftRemoteMirror SHARED TARGET_LIBRARY DONT_EMBED_BITCODE
55
SwiftRemoteMirror.cpp
66
LINK_LIBRARIES swiftReflection
7-
INSTALL_IN_COMPONENT stdlib)
7+
INSTALL_IN_COMPONENT swift-remote-mirror)
88
endif()

utils/build-presets.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
[preset: mixin_buildbot_install_components]
1717
dash-dash
1818

19-
swift-install-components=compiler;clang-builtin-headers;stdlib;sdk-overlay;editor-integration;tools;testsuite-tools;sourcekit-xpc-service;swift-remote-mirror-headers;
19+
swift-install-components=compiler;clang-builtin-headers;stdlib;sdk-overlay;editor-integration;tools;testsuite-tools;sourcekit-xpc-service;swift-remote-mirror;swift-remote-mirror-headers;
2020

2121

2222
[preset: mixin_buildbot_trunk_base]
@@ -590,7 +590,7 @@ install-llbuild
590590
install-swiftpm
591591
install-xctest
592592
install-prefix=/usr
593-
swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;sdk-overlay;license
593+
swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;license
594594
build-swift-static-stdlib
595595
build-swift-stdlib-unittest-extra
596596

@@ -652,7 +652,7 @@ install-foundation
652652
install-swiftpm
653653
install-xctest
654654
install-prefix=/usr
655-
swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;sdk-overlay;dev
655+
swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;dev
656656
build-swift-static-stdlib
657657
skip-test-lldb
658658

@@ -763,7 +763,7 @@ mixin-preset=
763763

764764
dash-dash
765765

766-
swift-install-components=compiler;clang-builtin-headers;stdlib;sdk-overlay;license;sourcekit-xpc-service;swift-remote-mirror-headers
766+
swift-install-components=compiler;clang-builtin-headers;stdlib;sdk-overlay;license;sourcekit-xpc-service;swift-remote-mirror;swift-remote-mirror-headers
767767
llvm-install-components=libclang;libclang-headers
768768

769769
# Path to the .tar.gz package we would create.

utils/build-script-impl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ KNOWN_SETTINGS=(
161161
build-swift-dynamic-sdk-overlay "" "set to 1 to build dynamic variants of the Swift SDK overlay"
162162
build-swift-static-sdk-overlay "" "set to 1 to build static variants of the Swift SDK overlay"
163163
build-swift-examples "1" "set to 1 to build examples"
164+
build-swift-remote-mirror "1" "set to 1 to build the Swift Remote Mirror library"
164165
build-serialized-stdlib-unittest "0" "set to 1 to build the StdlibUnittest module with -sil-serialize-all"
165166
build-sil-debugging-stdlib "0" "set to 1 to build the Swift standard library with -gsil to enable debugging and profiling on SIL level"
166167
check-incremental-compilation "0" "set to 1 to compile swift libraries multiple times to check if incremental compilation works"
@@ -1873,6 +1874,7 @@ for host in "${ALL_HOSTS[@]}"; do
18731874
-DSWIFT_NATIVE_CLANG_TOOLS_PATH:STRING="${native_clang_tools_path}"
18741875
-DSWIFT_NATIVE_SWIFT_TOOLS_PATH:STRING="${native_swift_tools_path}"
18751876
-DSWIFT_BUILD_TOOLS:BOOL=$(true_false "${BUILD_SWIFT_TOOLS}")
1877+
-DSWIFT_BUILD_REMOTE_MIRROR:BOOL=$(true_false "${BUILD_SWIFT_REMOTE_MIRROR}")
18761878
-DSWIFT_SERIALIZE_STDLIB_UNITTEST:BOOL=$(true_false "${BUILD_SERIALIZED_STDLIB_UNITTEST}")
18771879
-DSWIFT_STDLIB_SIL_DEBUGGING:BOOL=$(true_false "${BUILD_SIL_DEBUGGING_STDLIB}")
18781880
-DSWIFT_CHECK_INCREMENTAL_COMPILATION:BOOL=$(true_false "${CHECK_INCREMENTAL_COMPILATION}")

0 commit comments

Comments
 (0)