gn build: Add build files for non-framework xpc clangd bits

[thakis]

Summary

With this, check-clang-tools unit tests are complete, but the lit tests still don't run the one XPC test since this is still missing build files for the xpc framework.

[mbonadei]

LGTM, just a couple of comments.

llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/BUILD.gn

17

Missing ":conversions" in deps.

llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/enable.gni

3

Is it ok to keep this = current_os == "mac", from the CL description I had the feeling that xpc tests were still disabled.

[thakis]

llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/BUILD.gn

17

Thanks! Done.

llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/enable.gni

3

Yes, because clang-tools/extra/test/BUILD.gn still has CLANGD_BUILD_XPC_SUPPORT=0, so lit thinks xpc support isn't available and doesn't run the xpc lit tests. And the xpc unit tests pass, so they run after this change.

llvm/utils/gn/build/sync_source_lists_from_cmake.py

for gn_file in gn_files:
             print('remove:\n' + '\n'.join(remove))
         print()
 
 
 def sync_unittests():
     # Matches e.g. |add_llvm_unittest_with_input_files|.
     unittest_re = re.compile(r'^add_\S+_unittest', re.MULTILINE)
 
-    # FIXME: Add 'clang-tools-extra'.
-    checked = [ 'clang', 'lld', 'llvm' ]
+    checked = [ 'clang', 'clang-tools-extra', 'lld', 'llvm' ]
     for c in checked:
         for root, _, _ in os.walk(os.path.join(c, 'unittests')):
             cmake_file = os.path.join(root, 'CMakeLists.txt')
             if not os.path.exists(cmake_file):
                 continue
             if not unittest_re.search(open(cmake_file).read()):
                 continue  # Skip CMake files that just add subdirectories.
             gn_file = os.path.join('llvm/utils/gn/secondary', root, 'BUILD.gn')

llvm/utils/gn/secondary/clang-tools-extra/clangd/tool/BUILD.gn

+import("//clang-tools-extra/clangd/xpc/enable.gni")
 import("//llvm/utils/gn/build/write_cmake_config.gni")
 
-declare_args() {
-  # Whether to build clangd's XPC components.
-  clangd_build_xpc = false
-}
-
 write_cmake_config("features") {
   # FIXME: Try moving Features.inc.in to tools, seems like a better location.
   input = "../Features.inc.in"
   output = "$target_gen_dir/Features.inc"
   values = []
   if (clangd_build_xpc) {
     values += [ "CLANGD_BUILD_XPC=1" ]
   } else {
deps = [
     "//clang/lib/Basic",
     "//clang/lib/Format",
     "//clang/lib/Frontend",
     "//clang/lib/Sema",
     "//clang/lib/Tooling",
     "//clang/lib/Tooling/Core",
     "//llvm/lib/Support",
   ]
+  if (clangd_build_xpc) {
+    deps += [
+      "//clang-tools-extra/clangd/xpc:conversions",
+      "//clang-tools-extra/clangd/xpc:transport",
+    ]
+  }
 
   include_dirs = [
     "..",
 
     # To pick up the generated inc files.
     "$target_gen_dir",
   ]
   sources = [
     "ClangdMain.cpp",
   ]
-
-  if (clangd_build_xpc) {
-    # FIXME: Depend on clangdXpcJsonConversions, clangdXpcTransport
-  }
 }

llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/BUILD.gn

+static_library("conversions") {
+  output_name = "clangdXpcJsonConversions"
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang-tools-extra/clangd",
+    "//llvm/lib/Support",
+  ]
+  include_dirs = [ ".." ]
+  sources = [
+    "Conversion.cpp",
+  ]
+}
+
+static_library("transport") {
+  output_name = "clangdXpcTransport"
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang-tools-extra/clangd",
+    "//llvm/lib/Support",
+  ]
+  include_dirs = [ ".." ]
+  sources = [
+    "XPCTransport.cpp",
+  ]
+}

llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/enable.gni

+declare_args() {
+  # Whether to build clangd's XPC components.
+  clangd_build_xpc = current_os == "mac"
+}

llvm/utils/gn/secondary/clang-tools-extra/unittests/BUILD.gn

+import("//clang-tools-extra/clangd/xpc/enable.gni")
+
 group("unittests") {
   deps = [
     "clang-apply-replacements:ClangApplyReplacementsTests",
     "clang-change-namespace:ClangChangeNamespaceTests",
     "clang-doc:ClangDocTests",
     "clang-include-fixer:ClangIncludeFixerTests",
     "clang-include-fixer/find-all-symbols:FindAllSymbolsTests",
     "clang-move:ClangMoveTests",
     "clang-query:ClangQueryTests",
     "clang-tidy:ClangTidyTests",
     "clangd:ClangdTests",
   ]
-  # FIXME: dep on clangd/xpc:ClangdXpcTests once it exists
+  if (clangd_build_xpc) {
+    deps += [ "clangd/xpc:ClangdXpcTests" ]
+  }
   testonly = true
 }

llvm/utils/gn/secondary/clang-tools-extra/unittests/clangd/xpc/BUILD.gn

+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("ClangdXpcTests") {
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang-tools-extra/clangd",
+    "//clang-tools-extra/clangd/xpc:conversions",
+    "//llvm/lib/Support",
+    "//llvm/lib/Testing/Support",
+  ]
+  include_dirs = [ "//clang-tools-extra/clangd" ]
+  sources = [
+    "ConversionTests.cpp",
+  ]
+}