wip

Author: rintaro

cmake/modules/AddPureSwift.cmake

@@ -4,13 +4,12 @@ include(macCatalystUtils)
 function(force_add_dependencies TARGET)
   foreach(DEPENDENCY ${ARGN})
     string(REGEX REPLACE [<>:\"/\\|?*] _ sanitized ${DEPENDENCY})
-    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/forced-${sanitized}-dep.swift
-      COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/forced-${sanitized}-dep.swift
+    set(depfile "${CMAKE_CURRENT_BINARY_DIR}/forced-${sanitized}-dep.swift")
+    add_custom_command(OUTPUT ${depfile}
+      COMMAND ${CMAKE_COMMAND} -E touch ${depfile}
       DEPENDS ${DEPENDENCY}
     )
-    target_sources(${TARGET} PRIVATE
-      ${CMAKE_CURRENT_BINARY_DIR}/forced-${sanitized}-dep.swift
-    )
+    target_sources(${TARGET} PRIVATE ${depfile})
   endforeach()
 endfunction()
 
@@ -255,7 +254,7 @@ function(add_pure_swift_host_library name)
         >)
   else()
     # Emit a swiftmodule in the current directory.
-    set(module_dir "${CMAKE_CURRENT_BINARY_DIR}")
+    set(module_dir "${CMAKE_CURRENT_BINARY_DIR}/modules")
     set(module_file "${module_dir}/${name}.swiftmodule")
   endif()
 

cmake/modules/AddSwift.cmake

@@ -1012,12 +1012,12 @@ function(add_swift_host_tool executable)
       set_property(
         TARGET ${executable}
         APPEND PROPERTY INSTALL_RPATH
-          "@executable_path/../${extra_relative_rpath}lib")
+          "@executable_path/../${extra_relative_rpath}lib/swift/host/compiler")
     else()
       set_property(
         TARGET ${executable}
         APPEND PROPERTY INSTALL_RPATH
-          "$ORIGIN/../${extra_relative_rpath}lib")
+          "$ORIGIN/../${extra_relative_rpath}lib/swift/host/compiler")
     endif()
   endif()
 

cmake/modules/AddSwiftUnittests.cmake

@@ -133,11 +133,11 @@ function(add_swift_unittest test_dirname)
     if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
       set_property(
         TARGET ${test_dirname}
-        APPEND PROPERTY INSTALL_RPATH "@executable_path/${relative_lib_path}/swift/host")
+        APPEND PROPERTY INSTALL_RPATH "@executable_path/${relative_lib_path}/swift/host/compiler")
     elseif(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD")
       set_property(
         TARGET ${test_dirname}
-        APPEND PROPERTY INSTALL_RPATH "$ORIGIN/${relative_lib_path}/swift/host")
+        APPEND PROPERTY INSTALL_RPATH "$ORIGIN/${relative_lib_path}/swift/host/compiler")
     endif()
   endif()
 endfunction()

lib/CompilerSwiftSyntax/CMakeLists.txt

@@ -27,7 +27,6 @@ includeSwiftSyntax()
 
 # Make unified swift-syntax shared library.
 add_pure_swift_host_library(swiftSyntaxUnified SHARED)
-set_target_properties(swiftSyntaxUnified PROPERTIES LINKER_LANGUAGE Swift)
 
 macro(target_link_libraries_whole_archive target)
   set_property(TARGET ${target} PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
@@ -62,3 +61,11 @@ target_link_libraries_whole_archive(swiftSyntaxUnified
   _CompilerSwiftDiagnostics
   _CompilerSwiftIDEUtils
 )
+
+set_property(TARGET swiftSyntaxUnified PROPERTY
+  LIBRARY_OUTPUT_DIRECTORY "${SWIFT_HOST_LIBRARIES_DEST_DIR}/compiler"
+)
+swift_install_in_component(TARGETS swiftSyntaxUnified
+  ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/host/compiler" COMPONENT compiler
+  LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/host/compiler" COMPONENT compiler
+  RUNTIME DESTINATION "bin" COMPONENT compiler)

tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake

@@ -156,11 +156,11 @@ function(add_sourcekit_swift_runtime_link_flags target path HAS_SWIFT_MODULES)
   if(SWIFT_BUILD_SWIFT_SYNTAX)
     if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
       # Add rpath to the host Swift libraries.
-      file(RELATIVE_PATH relative_hostlib_path "${path}" "${SWIFTLIB_DIR}/host")
+      file(RELATIVE_PATH relative_hostlib_path "${path}" "${SWIFTLIB_DIR}/host/compiler")
       list(APPEND RPATH_LIST "@loader_path/${relative_hostlib_path}")
     elseif(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD")
       # Add rpath to the host Swift libraries.
-      file(RELATIVE_PATH relative_hostlib_path "${path}" "${SWIFTLIB_DIR}/host")
+      file(RELATIVE_PATH relative_hostlib_path "${path}" "${SWIFTLIB_DIR}/host/compiler")
       list(APPEND RPATH_LIST "$ORIGIN/${relative_hostlib_path}")
     else()
       target_link_directories(${target} PRIVATE

tools/libSwiftScan/CMakeLists.txt

@@ -49,17 +49,17 @@ if(SWIFT_BUILD_SWIFT_SYNTAX)
     # Ensure that we can find the shaered swiftsyntax libraries.
     set_property(
       TARGET libSwiftScan
-      APPEND PROPERTY INSTALL_RPATH "@loader_path")
+      APPEND PROPERTY INSTALL_RPATH "@loader_path/swift/host/compiler")
     set_property(
       TARGET libSwiftScan
-      APPEND PROPERTY INSTALL_RPATH "@loader_path/../..")
+      APPEND PROPERTY INSTALL_RPATH "@loader_path/compiler")
   elseif(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD")
     set_property(
       TARGET libSwiftScan
-      APPEND PROPERTY INSTALL_RPATH "$ORIGIN")
+      APPEND PROPERTY INSTALL_RPATH "$ORIGIN/swift/host/compiler")
     set_property(
       TARGET libSwiftScan
-      APPEND PROPERTY INSTALL_RPATH "$ORIGIN/../..")
+      APPEND PROPERTY INSTALL_RPATH "$ORIGIN/compiler")
   endif()
 endif()
 

tools/swift-plugin-server/CMakeLists.txt

@@ -29,4 +29,9 @@ if (SWIFT_BUILD_SWIFT_SYNTAX)
 
   set_property(TARGET ${name}
     PROPERTY BUILD_WITH_INSTALL_RPATH YES)
+
+  swift_install_in_component(TARGETS SwiftInProcPluginServer
+    ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/host" COMPONENT compiler
+    LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/host" COMPONENT compiler
+    RUNTIME DESTINATION "bin" COMPONENT compiler)
 endif()