Skip to content

Commit 015ef07

Browse files
committed
Runtimes: reorder Resync.cmake, add additional copying
We were not copying over the `Info.plist` and had checked in the file in a few of the supplemental libraries. Update this now to follow the proper behaviour.
1 parent 1367aab commit 015ef07

File tree

3 files changed

+19
-45
lines changed

3 files changed

+19
-45
lines changed

Runtimes/Resync.cmake

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,21 @@ endforeach()
9696
message(STATUS "plist[${StdlibSources}/Info.plist.in] -> Core/Info.plist.in")
9797
copy_files("" "Core" FILES "Info.plist.in")
9898

99-
message(STATUS "plist[${StdlibSources}/Info.plist.in] -> Supplemental/Synchronization/Info.plist.in")
100-
copy_files("" "Supplemental/Synchronization" FILES "Info.plist.in")
101-
10299
message(STATUS "plist[${StdlibSources}/Info.plist.in] -> Supplemental/Distributed/Info.plist.in")
103100
copy_files("" "Supplemental/Distributed" FILES "Info.plist.in")
104101

102+
message(STATUS "plist[${StdlibSources}/Info.plist.in] -> Supplemental/Differentiation/Info.plist.in")
103+
copy_files("" "Supplemental/Differentiation" FILES "Info.plist.in")
104+
105+
message(STATUS "plist[${StdlibSources}/Info.plist.in] -> Supplemental/Observation/Info.plist.in")
106+
copy_files("" "Supplemental/Observation" FILES "Info.plist.in")
107+
108+
message(STATUS "plist[${StdlibSources}/Info.plist.in] -> Supplemental/StringProcessing/Info.plist.in")
109+
copy_files("" "Supplemental/StringProcessing" FILES "Info.plist.in")
110+
111+
message(STATUS "plist[${StdlibSources}/Info.plist.in] -> Supplemental/Synchronization/Info.plist.in")
112+
copy_files("" "Supplemental/Synchronization" FILES "Info.plist.in")
113+
105114
# Platform Overlays
106115

107116
# Copy magic linker symbols
@@ -155,22 +164,19 @@ copy_files(public/Platform Overlay/Windows/CRT
155164
TiocConstants.swift
156165
tgmath.swift.gyb)
157166

158-
# Supplemental Libraries
159-
copy_library_sources(Synchronization "public" "Supplemental")
160-
copy_library_sources(Observation "public" "Supplemental")
161-
162-
# Copy Differentiation sources
163-
copy_library_sources("linker-support" "" "Supplemental/Differentiation")
164-
copy_library_sources("Differentiation" "public" "Supplemental")
165-
166-
# Copy StringProcessing, RegexParser, RegexBuilder
167167
if(NOT DEFINED StringProcessing_ROOT_DIR)
168168
find_path(StringProcessing_ROOT_DIR
169169
"swift-experimental-string-processing/Package.swift"
170170
HINTS "${CMAKE_CURRENT_LIST_DIR}/../../")
171171
endif()
172172
message(STATUS "String Processing Root: ${StringProcessing_ROOT_DIR}")
173173

174+
# Supplemental Libraries
175+
copy_library_sources(Differentiation "public" "Supplemental")
176+
copy_library_sources(Distributed "public" "Supplemental")
177+
copy_library_sources(Observation "public" "Supplemental")
178+
copy_library_sources(Synchronization "public" "Supplemental")
179+
174180
copy_library_sources(_RegexParser "Sources" "Supplemental/StringProcessing"
175181
ROOT "${StringProcessing_ROOT_DIR}/swift-experimental-string-processing")
176182
copy_library_sources(_StringProcessing "Sources" "Supplemental/StringProcessing"
@@ -180,5 +186,5 @@ copy_library_sources(_CUnicode "Sources" "Supplemental/StringProcessing/_StringP
180186
copy_library_sources(RegexBuilder "Sources" "Supplemental/StringProcessing"
181187
ROOT "${StringProcessing_ROOT_DIR}/swift-experimental-string-processing")
182188

183-
copy_library_sources("Distributed" "public" "Supplemental")
189+
copy_library_sources("linker-support" "" "Supplemental/Differentiation")
184190
copy_library_sources(include "" "Supplemental/Distributed")

Runtimes/Supplemental/Differentiation/Info.plist.in

Lines changed: 0 additions & 16 deletions
This file was deleted.

Runtimes/Supplemental/Observation/Info.plist.in

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)