Skip to content

Commit 6a2c90c

Browse files
compnerdcompnerd
committed
Runtimes: support installing the swiftdoc for the modules
Add support to install the swiftdoc into the installed image. This is required to allow us to package up the runtime on Windows.
1 parent 7992380 commit 6a2c90c

File tree

17 files changed

+53
-0
lines changed

17 files changed

+53
-0
lines changed

‎Runtimes/Core/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ include(AvailabilityMacros)
8282
include(CompilerSettings)
8383
include(DefaultSettings)
8484
include(EmitSwiftInterface)
85+
include(InstallSwiftDoc)
8586
include(PlatformInfo)
8687
include(gyb)
8788
include(ResourceEmbedding)

‎Runtimes/Core/Concurrency/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,3 +145,4 @@ install(TARGETS swift_Concurrency
145145
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
146146
emit_swift_interface(swift_Concurrency)
147147
install_swift_interface(swift_Concurrency)
148+
install_swift_doc(swift_Concurrency)

‎Runtimes/Core/SwiftOnoneSupport/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ install(TARGETS swiftSwiftOnoneSupport
3939
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
4040
emit_swift_interface(swiftSwiftOnoneSupport)
4141
install_swift_interface(swiftSwiftOnoneSupport)
42+
install_swift_doc(swiftSwiftOnoneSupport)
4243

4344
# Configure plist creation for Darwin platforms.
4445
generate_plist("${CMAKE_PROJECT_NAME}" "${CMAKE_PROJECT_VERSION}" swiftSwiftOnoneSupport)

‎Runtimes/Core/cmake/modules/InstallSwiftDoc.cmake

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
2+
function(install_swift_doc target)
3+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftdoc"
4+
RENAME "${SwiftCore_MODULE_TRIPLE}.swiftdoc"
5+
DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
6+
COMPONENT SwiftCore_development)
7+
if(SwiftCore_VARIANT_MODULE_TRIPLE)
8+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${SwiftCore_VARIANT_MODULE_TRIPLE}/${target}.swiftdoc"
9+
RENAME "${SwiftCore_VARIANT_MODULE_TRIPLE}.swiftdoc"
10+
DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
11+
COMPONENT SwiftCore_development)
12+
endif()
13+
endfunction()

‎Runtimes/Core/core/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,7 @@ install(TARGETS swiftCore
371371
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
372372
emit_swift_interface(swiftCore)
373373
install_swift_interface(swiftCore)
374+
install_swift_doc(swiftCore)
374375

375376
# Configure plist creation for Darwin platforms.
376377
generate_plist("${CMAKE_PROJECT_NAME}" "${CMAKE_PROJECT_VERSION}" swiftCore)

‎Runtimes/Overlay/Android/Android/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@ install(TARGETS swiftAndroid
2121
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
2222
emit_swift_interface(swiftAndroid)
2323
install_swift_interface(swiftAndroid)
24+
install_swift_doc(swiftAndroid)
2425

2526
embed_manifest(swiftAndroid)

‎Runtimes/Overlay/Android/Math/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@ install(TARGETS swift_math
1313
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
1414
emit_swift_interface(swift_math)
1515
install_swift_interface(swift_math)
16+
install_swift_doc(swift_math)
1617

1718
embed_manifest(swift_math)

‎Runtimes/Overlay/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ include(gyb)
3636
include(AvailabilityMacros)
3737
include(DefaultSettings)
3838
include(EmitSwiftInterface)
39+
include(InstallSwiftDoc)
3940
include(PlatformInfo)
4041
include(ResourceEmbedding)
4142

‎Runtimes/Overlay/Windows/CRT/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,6 @@ install(TARGETS swiftCRT
2323
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
2424
emit_swift_interface(swiftCRT)
2525
install_swift_interface(swiftCRT)
26+
install_swift_doc(swiftCRT)
2627

2728
embed_manifest(swiftCRT)

‎Runtimes/Overlay/Windows/WinSDK/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@ install(TARGETS swiftWinSDK
1515
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
1616
emit_swift_interface(swiftWinSDK)
1717
install_swift_interface(swiftWinSDK)
18+
install_swift_doc(swiftWinSDK)
1819

1920
embed_manifest(swiftWinSDK)

‎Runtimes/Overlay/clang/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@ install(TARGETS swift_Builtin_float
1818
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
1919
emit_swift_interface(swift_Builtin_float)
2020
install_swift_interface(swift_Builtin_float)
21+
install_swift_doc(swift_Builtin_float)
2122

2223
embed_manifest(swift_Builtin_float)

‎Runtimes/Overlay/cmake/modules/InstallSwiftDoc.cmake

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
2+
function(install_swift_doc target)
3+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftdoc"
4+
RENAME "${SwiftOverlay_MODULE_TRIPLE}.swiftdoc"
5+
DESTINATION "${SwiftOverlay_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
6+
COMPONENT SwiftOverlay_development)
7+
if(SwiftOverlay_VARIANT_MODULE_TRIPLE)
8+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${SwiftOverlay_VARIANT_MODULE_TRIPLE}/${target}.swiftdoc"
9+
RENAME "${SwiftOverlay_VARIANT_MODULE_TRIPLE}.swiftdoc"
10+
DESTINATION "${SwiftOverlay_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
11+
COMPONENT SwiftOverlay_development)
12+
endif()
13+
endfunction()

‎Runtimes/Supplemental/StringProcessing/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ include(GNUInstallDirs)
2626

2727
include(AvailabilityMacros)
2828
include(EmitSwiftInterface)
29+
include(InstallSwiftDoc)
2930
include(PlatformInfo)
3031
include(ResourceEmbedding)
3132

‎Runtimes/Supplemental/StringProcessing/RegexBuilder/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@ install(TARGETS swiftRegexBuilder
2020
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
2121
emit_swift_interface(swiftRegexBuilder)
2222
install_swift_interface(swiftRegexBuilder)
23+
install_swift_doc(swiftRegexBuilder)
2324

2425
embed_manifest(swiftRegexBuilder)

‎Runtimes/Supplemental/StringProcessing/_RegexParser/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,6 @@ install(TARGETS swift_RegexParser
4242
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
4343
emit_swift_interface(swift_RegexParser)
4444
install_swift_interface(swift_RegexParser)
45+
install_swift_doc(swift_RegexParser)
4546

4647
embed_manifest(swift_RegexParser)

‎Runtimes/Supplemental/StringProcessing/_StringProcessing/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,5 +85,6 @@ install(TARGETS swift_StringProcessing
8585
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
8686
emit_swift_interface(swift_StringProcessing)
8787
install_swift_interface(swift_StringProcessing)
88+
install_swift_doc(swift_StringProcessing)
8889

8990
embed_manifest(swift_StringProcessing)

‎Runtimes/Supplemental/cmake/modules/InstallSwiftDoc.cmake

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
2+
function(install_swift_doc target)
3+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftdoc"
4+
RENAME "${${PROJECT_NAME}_MODULE_TRIPLE}.swiftdoc"
5+
DESTINATION "${${PROJECT_NAME}_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
6+
COMPONENT ${PROJECT_NAME}_development)
7+
if(SwiftCore_VARIANT_MODULE_TRIPLE)
8+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${${PROJECT_NAME}_VARIANT_MODULE_TRIPLE}/${target}.swiftdoc"
9+
RENAME "${${PROJECT_NAME}_VARIANT_MODULE_TRIPLE}.swiftdoc"
10+
DESTINATION "${${PROJECT_NAME}_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
11+
COMPONENT ${PROJECT_NAME}_development)
12+
endif()
13+
endfunction()

0 commit comments

Comments
 (0)