Fold individual file copies into copy_files

Use the new copy_files to copy specific files into the appropriate
places without needing to duplicate as much code.

Author: etcwilde

Runtimes/Resync.cmake

@@ -28,7 +28,7 @@ function(copy_files from_prefix to_prefix)
       ONLY_IF_DIFFERENT)
     if(_output)
       message(SEND_ERROR
-        "Copy ${from_prefix}/${file} -> ${full_to_prefix}/${file} Failed: ${_output}")
+        "Copy ${ARG_ROOT}/${from_prefix}/${file} -> ${full_to_prefix}/${file} Failed: ${_output}")
     endif()
   endforeach()
 endfunction()
@@ -77,63 +77,6 @@ copy_library_sources(include "" "Core")
 # Copy magic linker symbols
 copy_library_sources("linker-support" "" "Core")
 
-# Copy Plist
-message(STATUS "plist[${StdlibSources}/Info.plist.in] -> Core/Info.plist.in")
-file(COPY_FILE
-  "${StdlibSources}/Info.plist.in"                             # From
-  "${CMAKE_CURRENT_LIST_DIR}/Core/Info.plist.in"               # To
-  RESULT _output
-  ONLY_IF_DIFFERENT)
-if(_output)
-  message(SEND_ERROR
-    "Copy ${StdlibSources}/Info.plist.in] -> Core/Info.plist.in Failed: ${_output}")
-endif()
-
-# Copy Windows clang overlays
-message(STATUS "modulemap[${StdlibSources}/Windows/ucrt.modulemap] -> Overlay/Windows/clang")
-file(COPY_FILE
-  "${StdlibSources}/public/Platform/ucrt.modulemap"                 # From
-  "${CMAKE_CURRENT_LIST_DIR}/Overlay/Windows/clang/ucrt.modulemap"  # To
-  RESULT _output
-  ONLY_IF_DIFFERENT)
-if(_output)
-  message(SEND_ERROR
-    "Copy ${StdlibSources}/public/Platform/ucrt.modulemap -> Overlay/Windows/clang/ucrt.modulemap Failed: ${_output}")
-endif()
-
-message(STATUS "modulemap[${StdlibSources}/Windows/winsdk.modulemap] -> Overlay/Windows/clang")
-file(COPY_FILE
-  "${StdlibSources}/public/Platform/winsdk.modulemap"                 # From
-  "${CMAKE_CURRENT_LIST_DIR}/Overlay/Windows/clang/winsdk.modulemap"  # To
-  RESULT _output
-  ONLY_IF_DIFFERENT)
-if(_output)
-  message(SEND_ERROR
-    "Copy ${StdlibSources}/public/Platform/winsdk.modulemap -> Overlay/Windows/clang/winsdk.modulemap Failed: ${_output}")
-endif()
-
-message(STATUS "modulemap[${StdlibSources}/Windows/vcruntime.modulemap] -> Overlay/Windows/clang")
-file(COPY_FILE
-  "${StdlibSources}/public/Platform/vcruntime.modulemap"                # From
-  "${CMAKE_CURRENT_LIST_DIR}/Overlay/Windows/clang/vcruntime.modulemap" # To
-  RESULT _output
-  ONLY_IF_DIFFERENT)
-if(_output)
-  message(SEND_ERROR
-    "Copy ${StdlibSources}/public/Platform/vcruntime.modulemap -> Overlay/Windows/clang/vcruntime.modulemap Failed: ${_output}")
-endif()
-
-message(STATUS "APINotes[${StdlibSources}/Windows/vcruntime.apinotes] -> Overlay/Windows/clang")
-file(COPY_FILE
-  "${StdlibSources}/public/Platform/vcruntime.apinotes"                 # From
-  "${CMAKE_CURRENT_LIST_DIR}/Overlay/Windows/clang/vcruntime.apinotes"  # To
-  RESULT _output
-  ONLY_IF_DIFFERENT)
-if(_output)
-  message(SEND_ERROR
-    "Copy ${StdlibSources}/public/Platform/vcruntime.apinotes -> Overlay/Windows/clang/vcruntime.modulemap Failed: ${_output}")
-endif()
-
 set(CoreLibs
   LLVMSupport
   SwiftShims
@@ -146,36 +89,35 @@ set(CoreLibs
   Concurrency
   Concurrency/InternalShims)
 
-  # Add these as we get them building
-  # Demangling
-
 foreach(library ${CoreLibs})
   copy_library_sources(${library} "public" "Core")
 endforeach()
 
-message(STATUS "CRT[${StdlibSources}/public/Platform] -> ${CMAKE_CURRENT_LIST_DIR}/Overlay/Windows/CRT")
-foreach(file ucrt.swift Platform.swift POSIXError.swift TiocConstants.swift tgmath.swift.gyb)
-  file(COPY_FILE
-    "${StdlibSources}/public/Platform/${file}"
-    "${CMAKE_CURRENT_LIST_DIR}/Overlay/Windows/CRT/${file}"
-    RESULT _output
-    ONLY_IF_DIFFERENT)
-  if(_output)
-    message(SEND_ERROR
-      "Copy Platform/${file} -> ${CMAKE_CURRENT_LIST_DIR}/Overlay/Windows/CRT/${file} Failed: ${_output}")
-  endif()
-endforeach()
+message(STATUS "plist[${StdlibSources}/Info.plist.in] -> Core/Info.plist.in")
+copy_files("" "Core" FILES "Info.plist.in")
+
+# Platform Overlays
 
+# Windows Overlay
 message(STATUS "WinSDK[${StdlibSources}/public/Windows] -> ${CMAKE_CURRENT_LIST_DIR}/Overlay/Windows/WinSDK")
-file(COPY_FILE
-  "${StdlibSources}/public/Windows/WinSDK.swift"
-  "${CMAKE_CURRENT_LIST_DIR}/Overlay/Windows/WinSDK/WinSDK.swift"
-  RESULT _output
-  ONLY_IF_DIFFERENT)
-if(_output)
-  message(SEND_ERROR
-    "Copy Windows/WinSDK.swift -> ${CMAKE_CURRENT_LIST_DIR}/Overlay/Windows/WinSDK/WinSDK.swift Failed: ${_output}")
-endif()
+copy_files(public/Windows Overlay/Windows/WinSDK FILES WinSDK.swift)
+
+message(STATUS "Windows Modulemaps[${StdlibSources}/Platform] -> ${CMAKE_CURRENT_LIST_DIR}/Overlay/Windows/clang")
+copy_files(public/Platform Overlay/Windows/clang
+  FILES
+    ucrt.modulemap
+    winsdk.modulemap
+    vcruntime.modulemap
+    vcruntime.apinotes)
+
+message(STATUS "CRT[${StdlibSources}/public/Platform] -> ${CMAKE_CURRENT_LIST_DIR}/Overlay/Windows/CRT")
+copy_files(public/Platform Overlay/Windows/CRT
+  FILES
+    ucrt.swift
+    Platform.swift
+    POSIXError.swift
+    TiocConstants.swift
+    tgmath.swift.gyb)
 
 # TODO: Add source directories for the platform overlays, supplemental
 # libraries, and test support libraries.