From 7f758e96c3aedd41780e40c5c91fb6aa8297a5a1 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <abdulras@thebrowser.company>
Date: Wed, 30 Jul 2025 16:22:22 -0700
Subject: [PATCH] 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.
---
 Runtimes/Resync.cmake                         | 32 +++++++++++--------
 .../Differentiation/Info.plist.in             | 16 ----------
 .../Supplemental/Observation/Info.plist.in    | 16 ----------
 3 files changed, 19 insertions(+), 45 deletions(-)
 delete mode 100644 Runtimes/Supplemental/Differentiation/Info.plist.in
 delete mode 100644 Runtimes/Supplemental/Observation/Info.plist.in

diff --git a/Runtimes/Resync.cmake b/Runtimes/Resync.cmake
index f4a835c1b6f..256220520d2 100644
--- a/Runtimes/Resync.cmake
+++ b/Runtimes/Resync.cmake
@@ -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")
diff --git a/Runtimes/Supplemental/Differentiation/Info.plist.in b/Runtimes/Supplemental/Differentiation/Info.plist.in
deleted file mode 100644
index 04673e8d55a..00000000000
--- a/Runtimes/Supplemental/Differentiation/Info.plist.in
+++ /dev/null
@@ -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>
diff --git a/Runtimes/Supplemental/Observation/Info.plist.in b/Runtimes/Supplemental/Observation/Info.plist.in
deleted file mode 100644
index 04673e8d55a..00000000000
--- a/Runtimes/Supplemental/Observation/Info.plist.in
+++ /dev/null
@@ -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>