Merge pull request #1728 from joakim-brannstrom/use-importc

libclang: use ImportC instead of D bindings

Author: joakim-brannstrom

Docker/partial/dmd_latest_version

@@ -1 +1 @@
-ENV DMD_VERSION 2.108.1
+ENV DMD_VERSION 2.109.1

Docker/partial/dmd_min_version

@@ -1 +1 @@
-ENV DMD_VERSION 2.104.0
+ENV DMD_VERSION 2.108.0

Docker/partial/ldc_latest_version

@@ -1 +1 @@
-ENV LDC_VERSION=1.38.0
+ENV LDC_VERSION=1.39.0

Docker/partial/ldc_min_version

@@ -1,4 +1,4 @@
-ENV LDC_VERSION=1.35.0
+ENV LDC_VERSION=1.38.0
 
 # workaround because otherwise it failes for min version with an errour about
 # unbound variable because it thinks it is running on windows.

LICENSE

@@ -377,5 +377,4 @@ Google Test         test/testdata/stage_4/fused_gtest/
 deimos-libclang     libclang/
 dsrcgen             dsrcgen/
 dstep               clang/
-clang hdrs          clang/resources/
 unit-threaded       unit-threaded/

cmake/Modules/FindLibClang.cmake

@@ -16,13 +16,23 @@
 
 set(LLVM_CMD_SRC ${CMAKE_SOURCE_DIR}/cmake/introspect_llvm.d)
 set(LLVM_CMD ${CMAKE_BINARY_DIR}/cmake_introspect_llvm)
+set(LIBCLANG_PREPROCESS_CMD_SRC ${CMAKE_SOURCE_DIR}/cmake/preprocess_libclang.d)
+set(LIBCLANG_PREPROCESS_CMD ${CMAKE_BINARY_DIR}/preprocess_libclang)
 
 if(UNIX)
     separate_arguments(cmdflags UNIX_COMMAND "${D_COMPILER_FLAGS}")
 else()
     separate_arguments(cmdflags WINDOWS_COMMAND "${D_COMPILER_FLAGS}")
 endif()
 
+execute_process(COMMAND ${D_COMPILER} ${cmdflags} ${LIBCLANG_PREPROCESS_CMD_SRC} -of${LIBCLANG_PREPROCESS_CMD}
+    OUTPUT_VARIABLE libclang_preprocess_CMD
+    RESULT_VARIABLE libclang_preprocess_CMD_status)
+if (llvm_config_CMD_status)
+    message(WARNING "Compiler output: ${libclang_preprocess_CMD}")
+    message(FATAL_ERROR "Unable to compile the LIBCLANG preprocessor: ${D_COMPILER} ${cmdflags} ${LIBCLANG_PREPROCESS_CMD_SRC} -of${LIBCLANG_PREPROCESS_CMD}")
+endif()
+
 execute_process(COMMAND ${D_COMPILER} ${cmdflags} ${LLVM_CMD_SRC} -of${LLVM_CMD}
     OUTPUT_VARIABLE llvm_config_CMD
     RESULT_VARIABLE llvm_config_CMD_status)
@@ -77,12 +87,18 @@ execute_process(COMMAND ${LLVM_CMD} ${CMAKE_SOURCE_DIR} libclang-flags
     RESULT_VARIABLE clang_config_LDFLAGS_status
     OUTPUT_STRIP_TRAILING_WHITESPACE)
 
+execute_process(COMMAND ${LLVM_CMD} ${CMAKE_SOURCE_DIR} includedir
+    OUTPUT_VARIABLE clang_config_INCLUDEDIR
+    RESULT_VARIABLE clang_config_INCLUDEDIR_status
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
 message(STATUS "llvm-config VERSION: ${llvm_config_VERSION}")
 message(STATUS "llvm-config MAJOR_VERSION: ${llvm_config_MAJOR_VERSION}")
 message(STATUS "llvm-config LIBDIR: ${llvm_config_LIBDIR}")
 message(STATUS "llvm-config LDFLAGS: ${llvm_config_LDFLAGS}")
 message(STATUS "llvm-config INCLUDE: ${llvm_config_CPPFLAGS}")
 message(STATUS "llvm-config LIBS: ${llvm_config_LIBS}")
+message(STATUS "llvm-config INCLUDEDIR: ${clang_config_INCLUDEDIR}")
 message(STATUS "clang-config LDFLAGS: ${clang_config_LDFLAGS}")
 
 # libCLANG ===================================================================

cmake/introspect_llvm.d

@@ -40,6 +40,7 @@ int main(string[] args) {
     cmds["libclang"] = &llvmLibClang;
     cmds["libclang-flags"] = &llvmClangFlags;
     cmds["print-llvm-config-candidates"] = &llvmPrintCandidates;
+    cmds["includedir"] = &llvmIncludeDir;
 
     if (auto f = args[2] in cmds)
         write((*f)().strip);
@@ -129,6 +130,11 @@ string llvmCppFlags() {
     return flags.output.strip;
 }
 
+string llvmIncludeDir() {
+    const flags = execute([llvmCmd.cmd, "--includedir"]);
+    return flags.output.strip;
+}
+
 string llvmLibdir() {
     return execute([llvmCmd.cmd, "--libdir"]).output.strip;
 }

cmake/preprocess_libclang.d

@@ -0,0 +1,33 @@
+#!/usr/bin/env dub
+/+ dub.sdl:
+    name "preprocess_libclang"
++/
+import std;
+
+int main(string[] args) {
+    if (args.length < 5) {
+        writefln("Usage: %s SRC_PATH DST_PATH <compiler flags>", args[0]);
+        writeln("SRC_PATH - path to libclang headers such as Index.h");
+        writeln("DST_PATH - where to write the preprocessed headers");
+        writeln("<compiler flags> - flags needed to preprocess headers such as -I");
+        return 1;
+    }
+
+    const src = args[1];
+    const dst = buildPath(args[2], "clang/c");
+    const dstHdr = buildPath(args[2], "clang-c");
+    const flags = args[3 .. $];
+
+    mkdirRecurse(dst);
+    mkdirRecurse(dstHdr);
+
+    writeln("Processing libclang headers");
+    foreach (hdr; dirEntries(src, SpanMode.shallow).filter!(a => a.extension == ".h")) {
+        writeln("  ", hdr.name);
+        auto content = readText(hdr.name);
+        File(buildPath(dst, hdr.name.baseName.setExtension(".c")), "w").writeln(content);
+        File(buildPath(dstHdr, hdr.name.baseName.setExtension(".h")), "w").writeln(content);
+    }
+
+    return 0;
+}

libs/clang/CMakeLists.txt

@@ -1,7 +1,6 @@
 # vim: filetype=cmake
 
 set(SRC_FILES
-    ${CMAKE_CURRENT_LIST_DIR}/source/clang/Compiler.d
     ${CMAKE_CURRENT_LIST_DIR}/source/clang/Cursor.d
     ${CMAKE_CURRENT_LIST_DIR}/source/clang/Diagnostic.d
     ${CMAKE_CURRENT_LIST_DIR}/source/clang/Eval.d
@@ -18,7 +17,7 @@ set(SRC_FILES
 )
 
 set(flags
-    "-J${CMAKE_CURRENT_LIST_DIR}/resources -I${LIBCLANG_INC} -I${CMAKE_SOURCE_DIR}/vendor/mylib/source"
+    "${LIBCLANG_INC} -I${CMAKE_SOURCE_DIR}/vendor/mylib/source"
 )
 
 compile_d_static_lib(dextool_clang "${SRC_FILES}" "${flags}" "" "dextool_libclang;dextool_mylib")