averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Runtimes: reorder Resync.cmake, add additional copying

Browse Source 
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.
This commit is contained in:
Saleem Abdulrasool
2025-07-30 16:22:22 -07:00
parent e3d381b557
commit 7f758e96c3
3 changed files with 19 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Runtimes/Resync.cmake
View File

@@ -96,12 +96,21 @@ endforeach()
message(STATUS "plist[${StdlibSources}/Info.plist.in] -> Core/Info.plist.in")
copy_files("" "Core" FILES "Info.plist.in")
message(STATUS "plist[${StdlibSources}/Info.plist.in] -> Supplemental/Synchronization/Info.plist.in")
copy_files("" "Supplemental/Synchronization" FILES "Info.plist.in")
message(STATUS "plist[${StdlibSources}/Info.plist.in] -> Supplemental/Distributed/Info.plist.in")
copy_files("" "Supplemental/Distributed" FILES "Info.plist.in")
message(STATUS "plist[${StdlibSources}/Info.plist.in] -> Supplemental/Differentiation/Info.plist.in")
copy_files("" "Supplemental/Differentiation" FILES "Info.plist.in")
message(STATUS "plist[${StdlibSources}/Info.plist.in] -> Supplemental/Observation/Info.plist.in")
copy_files("" "Supplemental/Observation" FILES "Info.plist.in")
message(STATUS "plist[${StdlibSources}/Info.plist.in] -> Supplemental/StringProcessing/Info.plist.in")
copy_files("" "Supplemental/StringProcessing" FILES "Info.plist.in")
message(STATUS "plist[${StdlibSources}/Info.plist.in] -> Supplemental/Synchronization/Info.plist.in")
copy_files("" "Supplemental/Synchronization" FILES "Info.plist.in")
# Platform Overlays
# Copy magic linker symbols
@@ -155,15 +164,6 @@ copy_files(public/Platform Overlay/Windows/CRT
TiocConstants.swift
tgmath.swift.gyb)
# Supplemental Libraries
copy_library_sources(Synchronization "public" "Supplemental")
copy_library_sources(Observation "public" "Supplemental")
# Copy Differentiation sources
copy_library_sources("linker-support" "" "Supplemental/Differentiation")
copy_library_sources("Differentiation" "public" "Supplemental")
# Copy StringProcessing, RegexParser, RegexBuilder
if(NOT DEFINED StringProcessing_ROOT_DIR)
find_path(StringProcessing_ROOT_DIR
"swift-experimental-string-processing/Package.swift"
@@ -171,6 +171,12 @@ if(NOT DEFINED StringProcessing_ROOT_DIR)
endif()
message(STATUS "String Processing Root: ${StringProcessing_ROOT_DIR}")
# Supplemental Libraries
copy_library_sources(Differentiation "public" "Supplemental")
copy_library_sources(Distributed "public" "Supplemental")
copy_library_sources(Observation "public" "Supplemental")
copy_library_sources(Synchronization "public" "Supplemental")
copy_library_sources(_RegexParser "Sources" "Supplemental/StringProcessing"
ROOT "${StringProcessing_ROOT_DIR}/swift-experimental-string-processing")
copy_library_sources(_StringProcessing "Sources" "Supplemental/StringProcessing"
@@ -180,5 +186,5 @@ copy_library_sources(_CUnicode "Sources" "Supplemental/StringProcessing/_StringP
copy_library_sources(RegexBuilder "Sources" "Supplemental/StringProcessing"
ROOT "${StringProcessing_ROOT_DIR}/swift-experimental-string-processing")
copy_library_sources("Distributed" "public" "Supplemental")
copy_library_sources("linker-support" "" "Supplemental/Differentiation")
copy_library_sources(include "" "Supplemental/Distributed")

16
Runtimes/Supplemental/Differentiation/Info.plist.in
View File

@@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleIdentifier</key>
<string>@PLIST_INFO_UTI@</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>@PLIST_INFO_NAME@</string>
<key>CFBundleShortVersionString</key>
<string>@PLIST_INFO_VERSION@</string>
<key>CFBundleVersion</key>
<string>@PLIST_INFO_BUILD_VERSION@</string>
</dict>
</plist>

16
Runtimes/Supplemental/Observation/Info.plist.in
View File

@@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleIdentifier</key>
<string>@PLIST_INFO_UTI@</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>@PLIST_INFO_NAME@</string>
<key>CFBundleShortVersionString</key>
<string>@PLIST_INFO_VERSION@</string>
<key>CFBundleVersion</key>
<string>@PLIST_INFO_BUILD_VERSION@</string>
</dict>
</plist>