Merge pull request #32828 from xedin/translation-placement

[Frontend] Diagnostic translations re-org

Author: xedin

CMakeLists.txt

@@ -1109,6 +1109,8 @@ if(SWIFT_INCLUDE_TOOLS)
   add_subdirectory(tools)
 endif()
 
+add_subdirectory(localization)
+
 add_subdirectory(utils)
 
 add_subdirectory(userdocs)

include/swift/AST/CMakeLists.txt

@@ -63,12 +63,11 @@ void CompilerInvocation::setMainExecutablePath(StringRef Path) {
                           "diagnostics");
   DiagnosticOpts.DiagnosticDocumentationPath = std::string(DiagnosticDocsPath.str());
 
-  // Compute the path of the YAML diagnostic messages directory files
-  // in the toolchain.
+  // Compute the path to the diagnostic translations in the toolchain/build.
   llvm::SmallString<128> DiagnosticMessagesDir(Path);
   llvm::sys::path::remove_filename(DiagnosticMessagesDir); // Remove /swift
   llvm::sys::path::remove_filename(DiagnosticMessagesDir); // Remove /bin
-  llvm::sys::path::append(DiagnosticMessagesDir, "share", "swift");
+  llvm::sys::path::append(DiagnosticMessagesDir, "share", "swift", "diagnostics");
   DiagnosticOpts.LocalizationPath = std::string(DiagnosticMessagesDir.str());
 }
 

lib/Frontend/CompilerInvocation.cpp

@@ -0,0 +1,14 @@
+add_custom_target(diagnostic-translation-database)
+
+add_custom_command(
+  TARGET diagnostic-translation-database
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+  DEPENDS diagnostics
+  COMMAND "${CMAKE_COMMAND}" -E copy_directory diagnostics/ "${SWIFT_BINARY_DIR}/share/swift/diagnostics/")
+
+add_dependencies(swift-frontend diagnostic-translation-database)
+
+swift_install_in_component(
+  DIRECTORY diagnostics
+  DESTINATION "share/swift"
+  COMPONENT compiler)