build: attempt to bundle files for the modules

This adds a helper to bundle files into the resource directory for the
module.

Author: compnerd

Sources/CMakeLists.txt

@@ -8,6 +8,21 @@ See http://swift.org/LICENSE.txt for license information
 See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 ]]
 
+include(CMakeParseArguments)
+function(SwiftBuild_Bundle)
+  set(Options)
+  set(OneValueArguments MODULE)
+  set(MultiValueArguments FILES)
+  cmake_parse_arguments(PARSE_ARGV 0 BundleXCSpecs
+    "${Options}" "${OneValueArguments}" "${MultiValueArguments}")
+
+  add_custom_command(TARGET ${BundleXCSpecs_MODULE} POST_BUILD
+    COMMAND
+      ${CMAKE_COMMAND} -E make_directory "$<TARGET_PROPERTY:${BundleXCSpecs_MODULE},LOCATION>/SwiftBuild_${BundleXCSpecs_MODULE}.resources"
+    COMMAND
+      ${CMAKE_COMMAND} -E copy_if_different ${BundleXCSpecs_FILES} "$<TARGET_PROPERTY:${BundleXCSpecs_MODULE},LOCATION>/SwiftBuild_${BundleXCSpecs_MODULE}.resources/")
+endfunction()
+
 add_subdirectory(SWBCSupport)
 add_subdirectory(SWBCLibc)
 add_subdirectory(SWBLibc)

Sources/SWBAndroidPlatform/CMakeLists.txt

@@ -45,3 +45,6 @@ set_property(GLOBAL APPEND PROPERTY SWIFTBUILD_EXPORTS SWBAndroidPlatform)
 
 install(TARGETS SWBAndroidPlatform
     ARCHIVE DESTINATION "${SwiftBuild_INSTALL_LIBDIR}")
+
+SwiftBuild_Bundle(MODULE SWBAndroidPlatform FILES
+  Android.xcspec)

Sources/SWBGenericUnixPlatform/CMakeLists.txt

@@ -43,3 +43,9 @@ set_property(GLOBAL APPEND PROPERTY SWIFTBUILD_EXPORTS SWBGenericUnixPlatform)
 
 install(TARGETS SWBGenericUnixPlatform
     ARCHIVE DESTINATION "${SwiftBuild_INSTALL_LIBDIR}")
+
+SwiftBuild_Bundle(MODULE SWBGenericUnixPlatform FILES
+  Unix.xcspec
+  UnixCompile.xcspec
+  UnixLd.xcspec
+  UnixLibtool.xcspec)

Sources/SWBQNXPlatform/CMakeLists.txt

@@ -45,3 +45,8 @@ set_property(GLOBAL APPEND PROPERTY SWIFTBUILD_EXPORTS SWBQNXPlatform)
 
 install(TARGETS SWBQNXPlatform
     ARCHIVE DESTINATION "${SwiftBuild_INSTALL_LIBDIR}")
+
+SwiftBuild_Bundle(MODULE SWBQNXPlatform FILES
+  QNX.xcspec
+  QNXCompile.xcspec
+  QNXLibtool.xcspec)

Sources/SWBWebAssemblyPlatform/CMakeLists.txt

@@ -44,3 +44,9 @@ set_property(GLOBAL APPEND PROPERTY SWIFTBUILD_EXPORTS SWBWebAssemblyPlatform)
 
 install(TARGETS SWBWebAssemblyPlatform
     ARCHIVE DESTINATION "${SwiftBuild_INSTALL_LIBDIR}")
+
+SwiftBuild_Bundle(MODULE SWBWebAssemblyPlatform FILES
+  WasmCompile.xcspec
+  WasmLd.xcspec
+  WasmLibtool.xcspec
+  WebAssembly.xcspec)

Sources/SWBWindowsPlatform/CMakeLists.txt

@@ -46,3 +46,9 @@ set_property(GLOBAL APPEND PROPERTY SWIFTBUILD_EXPORTS SWBWindowsPlatform)
 
 install(TARGETS SWBWindowsPlatform
     ARCHIVE DESTINATION "${SwiftBuild_INSTALL_LIBDIR}")
+
+SwiftBuild_Bundle(MODULE SWBWindowsPlatform FILES
+  Windows.xcspec
+  WindowsCompile.xcspec
+  WindowsLd.xcspec
+  WindowsLibtool.xcspec)