summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--clang-tools-extra/clangd/CMakeLists.txt2
-rw-r--r--clang-tools-extra/clangd/indexer/CMakeLists.txt (renamed from clang-tools-extra/clangd/global-symbol-builder/CMakeLists.txt)6
-rw-r--r--clang-tools-extra/clangd/indexer/IndexerMain.cpp (renamed from clang-tools-extra/clangd/global-symbol-builder/GlobalSymbolBuilderMain.cpp)4
-rw-r--r--clang-tools-extra/test/CMakeLists.txt2
-rw-r--r--clang-tools-extra/test/clangd/index-tools.test2
5 files changed, 8 insertions, 8 deletions
diff --git a/clang-tools-extra/clangd/CMakeLists.txt b/clang-tools-extra/clangd/CMakeLists.txt
index 3cdb1e113f8..7991aba8911 100644
--- a/clang-tools-extra/clangd/CMakeLists.txt
+++ b/clang-tools-extra/clangd/CMakeLists.txt
@@ -73,7 +73,7 @@ if( LLVM_LIB_FUZZING_ENGINE OR LLVM_USE_SANITIZE_COVERAGE )
add_subdirectory(fuzzer)
endif()
add_subdirectory(tool)
-add_subdirectory(global-symbol-builder)
+add_subdirectory(indexer)
add_subdirectory(index/dex/dexp)
if (LLVM_INCLUDE_BENCHMARKS)
diff --git a/clang-tools-extra/clangd/global-symbol-builder/CMakeLists.txt b/clang-tools-extra/clangd/indexer/CMakeLists.txt
index c81da16ed5e..5ba5b6773e8 100644
--- a/clang-tools-extra/clangd/global-symbol-builder/CMakeLists.txt
+++ b/clang-tools-extra/clangd/indexer/CMakeLists.txt
@@ -4,11 +4,11 @@ set(LLVM_LINK_COMPONENTS
Support
)
-add_clang_executable(global-symbol-builder
- GlobalSymbolBuilderMain.cpp
+add_clang_executable(clangd-indexer
+ IndexerMain.cpp
)
-target_link_libraries(global-symbol-builder
+target_link_libraries(clangd-indexer
PRIVATE
clangAST
clangIndex
diff --git a/clang-tools-extra/clangd/global-symbol-builder/GlobalSymbolBuilderMain.cpp b/clang-tools-extra/clangd/indexer/IndexerMain.cpp
index e0333f58977..918b5878912 100644
--- a/clang-tools-extra/clangd/global-symbol-builder/GlobalSymbolBuilderMain.cpp
+++ b/clang-tools-extra/clangd/indexer/IndexerMain.cpp
@@ -225,11 +225,11 @@ int main(int argc, const char **argv) {
Example usage for building index for the whole project using CMake compile
commands:
- $ global-symbol-builder --executor=all-TUs compile_commands.json > index.yaml
+ $ clangd-indexer --executor=all-TUs compile_commands.json > index.yaml
Example usage for file sequence index without flags:
- $ global-symbol-builder File1.cpp File2.cpp ... FileN.cpp > index.yaml
+ $ clangd-indexer File1.cpp File2.cpp ... FileN.cpp > index.yaml
Note: only symbols from header files will be collected.
)";
diff --git a/clang-tools-extra/test/CMakeLists.txt b/clang-tools-extra/test/CMakeLists.txt
index fafe6c0cf26..e0ad2c3b657 100644
--- a/clang-tools-extra/test/CMakeLists.txt
+++ b/clang-tools-extra/test/CMakeLists.txt
@@ -55,7 +55,7 @@ set(CLANG_TOOLS_TEST_DEPS
# These individual tools have no tests, add them here to make them compile
# together with check-clang-tools, so that we won't break them in the future.
- global-symbol-builder
+ clangd-indexer
# Unit tests
ExtraToolsUnitTests
diff --git a/clang-tools-extra/test/clangd/index-tools.test b/clang-tools-extra/test/clangd/index-tools.test
index 48dbf59e07e..b01d5bcd174 100644
--- a/clang-tools-extra/test/clangd/index-tools.test
+++ b/clang-tools-extra/test/clangd/index-tools.test
@@ -1,3 +1,3 @@
-# RUN: global-symbol-builder %p/Inputs/BenchmarkSource.cpp -- -I%p/Inputs > %t.index
+# RUN: clangd-indexer %p/Inputs/BenchmarkSource.cpp -- -I%p/Inputs > %t.index
# FIXME: By default, benchmarks are excluded from the list of default targets hence not built. Find a way to depend on benchmarks to run the next command.
# RUN: if [ -f %clangd-benchmark-dir/IndexBenchmark ]; then %clangd-benchmark-dir/IndexBenchmark %t.index %p/Inputs/requests.log --benchmark_min_time=0.01 ; fi
OpenPOWER on IntegriCloud