Move libSwiftScan from 'tools' to 'lib/Tooling'

'tools' should be reserved for executable tools.

Author: artemcm

CMakeLists.txt

@@ -1430,6 +1430,10 @@ if(SWIFT_ENABLE_DISPATCH)
 endif()
 
 # Add all of the subdirectories, where we actually do work.
+add_subdirectory(include)
+if(SWIFT_INCLUDE_TOOLS)
+  add_subdirectory(lib)
+endif()
 
 ###############
 # PLEASE READ #
@@ -1482,11 +1486,7 @@ if(SWIFT_INCLUDE_APINOTES)
   add_subdirectory(apinotes)
 endif()
 
-add_subdirectory(include)
-
 if(SWIFT_INCLUDE_TOOLS)
-  add_subdirectory(lib)
-
   add_subdirectory(SwiftCompilerSources)
 
   # Always include this after including stdlib/!

lib/CMakeLists.txt

@@ -75,6 +75,7 @@ add_subdirectory(StaticMirror)
 add_subdirectory(SymbolGraphGen)
 add_subdirectory(SwiftSyntax)
 add_subdirectory(Threading)
+add_subdirectory(Tooling)
 
 if(SWIFT_BUILD_EXTERNAL_GENERIC_METADATA_BUILDER)
   add_subdirectory(ExternalGenericMetadataBuilder)

lib/Tooling/CMakeLists.txt

@@ -0,0 +1 @@
+add_swift_tool_subdirectory(libSwiftScan)

tools/libSwiftScan/CMakeLists.txt renamed to lib/Tooling/libSwiftScan/CMakeLists.txt

@@ -398,12 +398,18 @@ if(BOOTSTRAPPING_MODE STREQUAL "BOOTSTRAPPING")
                     BOOTSTRAPPING 1)
 endif()
 
+set(tooling_stdlib_deps)
+if(TARGET libSwiftScan)
+  list(APPEND tooling_stdlib_deps libSwiftScan)
+endif()
+
 add_swift_target_library(swiftCore
                   ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES}
                   ${swiftCore_common_options}
                   ${compile_flags_for_final_build}
                   FILE_DEPENDS
                     ${swiftCore_common_dependencies}
+                  DEPENDS ${tooling_stdlib_deps}  
                   INSTALL_IN_COMPONENT
                     stdlib
                   MACCATALYST_BUILD_FLAVOR

tools/libSwiftScan/SwiftCaching.cpp renamed to lib/Tooling/libSwiftScan/SwiftCaching.cpp

@@ -24,7 +24,6 @@ add_swift_tool_subdirectory(swift-def-to-strings-converter)
 add_swift_tool_subdirectory(swift-serialize-diagnostics)
 add_swift_tool_subdirectory(swift-ast-script)
 add_swift_tool_subdirectory(swift-refactor)
-add_swift_tool_subdirectory(libSwiftScan)
 add_swift_tool_subdirectory(libStaticMirror)
 add_swift_tool_subdirectory(libMockPlugin)
 add_swift_tool_subdirectory(swift-plugin-server)