Ensure fileIndex is unique

Change-Id: I3a8c7b237cb0e08814a4d5f3f3ad0534d9672451
Reviewed-on: https://codereview.kdab.com/c/kdab/code_browser/+/132788
Reviewed-by: Waqar Ahmed <[email protected]>

Author: Waqar144

generator/annotator.cpp

@@ -243,11 +243,19 @@ void Annotator::registerInterestingDefinition(clang::SourceRange sourceRange,
 
 bool Annotator::generate(clang::Sema &Sema, bool WasInDatabase)
 {
+#if CLANG_VERSION_MAJOR >= 16
+    static const std::string mp_suffix =
+        llvm::sys::Process::GetEnv("MULTIPROCESS_MODE").value_or("");
+#else
+    static const std::string mp_suffix =
+        llvm::sys::Process::GetEnv("MULTIPROCESS_MODE").getValueOr("");
+#endif
+
     std::ofstream fileIndex;
-    fileIndex.open(projectManager.outputPrefix + "/fileIndex", std::ios::app);
+    fileIndex.open(projectManager.outputPrefix + "/fileIndex" + mp_suffix, std::ios::app);
     if (!fileIndex) {
         create_directories(projectManager.outputPrefix);
-        fileIndex.open(projectManager.outputPrefix + "/fileIndex", std::ios::app);
+        fileIndex.open(projectManager.outputPrefix + "/fileIndex" + mp_suffix, std::ios::app);
         if (!fileIndex) {
             std::cerr << "Can't generate index for " << std::endl;
             return false;
@@ -257,14 +265,6 @@ bool Annotator::generate(clang::Sema &Sema, bool WasInDatabase)
     // make sure the main file is in the cache.
     htmlNameForFile(getSourceMgr().getMainFileID());
 
-#if CLANG_VERSION_MAJOR >= 16
-    static const std::string mp_suffix =
-        llvm::sys::Process::GetEnv("MULTIPROCESS_MODE").value_or("");
-#else
-    static const std::string mp_suffix =
-        llvm::sys::Process::GetEnv("MULTIPROCESS_MODE").getValueOr("");
-#endif
-
     std::set<std::string> done;
     for (auto it : cache) {
         if (!it.second.first)

scripts/runner.py

@@ -112,6 +112,9 @@ def do_merge(out, max_task):
     print("Merging ", refsM)
     do_merge_dir(refsM, max_task)
 
+    print("Merging fileIndex")
+    do_merge_dir(out, max_task)
+
 
 def main():
     usage = "python runner.py -p compile_commands.json -o output/ -e ./generator/codebrowser_generator -a project_name -x external_project"