Move index in build/rules_index

Author: lucic71

CMakeLists.txt

@@ -230,7 +230,7 @@ endforeach()
 set(cpp_rules_ir_outputs)
 set(cpp_rules_index_outputs)
 set(cpp_rules_index_inputs)
-set(_index_clean_stamp ${RULES_IR_DIR}/index/clean.stamp)
+set(_index_clean_stamp ${CMAKE_BINARY_DIR}/rules_index/clean.stamp)
 set(rust_rules_ir_outputs)
 foreach(_rule_dir IN LISTS rule_subdirs)
   file(GLOB _cpp_srcs ${_rule_dir}/src.c ${_rule_dir}/src.cpp)
@@ -263,7 +263,7 @@ foreach(_rule_dir IN LISTS rule_subdirs)
     add_custom_command(
       OUTPUT ${_index_stamp}
       COMMAND ${CMAKE_COMMAND} -E make_directory ${_out_dir}
-      COMMAND $<TARGET_FILE:cpp-rule-indexer> --dir ${_rule_dir} --path ${_rule_name} --index ${RULES_IR_DIR}/index ${_cxxflags} ${_common_headers}
+      COMMAND $<TARGET_FILE:cpp-rule-indexer> --dir ${_rule_dir} --path ${_rule_name} --index ${CMAKE_BINARY_DIR}/rules_index ${_cxxflags} ${_common_headers}
       COMMAND ${CMAKE_COMMAND} -E touch ${_index_stamp}
       DEPENDS ${_index_clean_stamp}
       VERBATIM
@@ -304,8 +304,8 @@ add_custom_target("preprocess-cpp-rules" ALL DEPENDS ${cpp_rules_ir_outputs})
 
 add_custom_command(
   OUTPUT ${_index_clean_stamp}
-  COMMAND ${CMAKE_COMMAND} -E rm -rf ${RULES_IR_DIR}/index
-  COMMAND ${CMAKE_COMMAND} -E make_directory ${RULES_IR_DIR}/index
+  COMMAND ${CMAKE_COMMAND} -E rm -rf ${CMAKE_BINARY_DIR}/rules_index
+  COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/rules_index
   COMMAND ${CMAKE_COMMAND} -E touch ${_index_clean_stamp}
   DEPENDS ${cpp_rules_index_inputs} ${rule_common_headers} ${rule_indexer_sources}
   VERBATIM

cpp2rust/converter/rules/registry.cpp

@@ -12,7 +12,6 @@
 
 #include "converter/converter_lib.h"
 #include "converter/printer.h"
-#include "converter/rules/rules_loader.h"
 
 namespace cpp2rust::RuleRegistry {
 
@@ -34,9 +33,6 @@ void addRulesFromDirectory(const std::filesystem::path &dir, Model model) {
   namespace fs = std::filesystem;
   for (const auto &entry : fs::directory_iterator(dir)) {
     const auto &path = entry.path();
-    if (path.filename() == RulesLoader::kIndexDirName) {
-      continue;
-    }
     assert(fs::exists(path / "ir_src.json") &&
            (fs::exists(path / "ir_unsafe.json") ||
             fs::exists(path / "ir_refcount.json")));

cpp2rust/converter/rules/rules_loader.cpp

@@ -424,8 +424,10 @@ void PragmaHandler::HandlePragma(clang::Preprocessor &PP,
   }
   ctx.setTraversalScope({ctx.getTranslationUnitDecl()});
 
-  auto text = BuildRulesBuffer(fs::path(rules_dir_) / kIndexDirName, selected,
-                               ctx.getLangOpts().CPlusPlus);
+  auto index_dir =
+      fs::weakly_canonical(rules_dir_).parent_path() / kIndexDirName;
+  auto text =
+      BuildRulesBuffer(index_dir, selected, ctx.getLangOpts().CPlusPlus);
   log() << "rules loaded for this translation unit:\n" << text;
   auto rules_file = src_mgr.createFileID(
       llvm::MemoryBuffer::getMemBufferCopy(text, "<cpp2rust-rules>"),

cpp2rust/converter/rules/rules_loader.h

@@ -18,7 +18,7 @@ namespace cpp2rust::RulesLoader {
 
 inline constexpr const char *kPragmaName = "cpp2rust_rules";
 
-inline constexpr const char *kIndexDirName = "index";
+inline constexpr const char *kIndexDirName = "rules_index";
 
 std::filesystem::path ClassKey(const clang::NamedDecl *decl);