Track clang r213171
The clang rewriter is now a core facility.
llvm-svn: 213172
GitOrigin-RevId: e208dfc2afb5d2460200e50dfcaab6e03459bf22
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33a5ce9..1f2132f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,8 @@
-if(CLANG_ENABLE_REWRITER)
add_subdirectory(clang-apply-replacements)
add_subdirectory(clang-modernize)
add_subdirectory(modularize)
add_subdirectory(module-map-checker)
add_subdirectory(remove-cstr-calls)
-endif()
if(CLANG_ENABLE_STATIC_ANALYZER)
add_subdirectory(clang-tidy)
endif()
@@ -15,7 +13,7 @@
# Add the common testsuite after all the tools.
# TODO: Support tests with more granularity when features are off?
-if(CLANG_ENABLE_REWRITER AND CLANG_ENABLE_STATIC_ANALYZER)
+if(CLANG_ENABLE_STATIC_ANALYZER)
add_subdirectory(test)
add_subdirectory(unittests)
endif()
diff --git a/clang-apply-replacements/CMakeLists.txt b/clang-apply-replacements/CMakeLists.txt
index 2458fc0..6c40965 100644
--- a/clang-apply-replacements/CMakeLists.txt
+++ b/clang-apply-replacements/CMakeLists.txt
@@ -7,7 +7,7 @@
LINK_LIBS
clangBasic
- clangRewriteCore
+ clangRewrite
clangTooling
)
diff --git a/clang-apply-replacements/tool/CMakeLists.txt b/clang-apply-replacements/tool/CMakeLists.txt
index 8baa0e5..e3d11fe 100644
--- a/clang-apply-replacements/tool/CMakeLists.txt
+++ b/clang-apply-replacements/tool/CMakeLists.txt
@@ -9,7 +9,7 @@
clangApplyReplacements
clangBasic
clangFormat
- clangRewriteCore
+ clangRewrite
clangTooling
)
diff --git a/clang-apply-replacements/tool/Makefile b/clang-apply-replacements/tool/Makefile
index 97d9927..6947f8f 100644
--- a/clang-apply-replacements/tool/Makefile
+++ b/clang-apply-replacements/tool/Makefile
@@ -20,7 +20,7 @@
LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc mcparser option
USEDLIBS = clangApplyReplacements.a clangFormat.a clangTooling.a clangFrontend.a \
clangSerialization.a clangDriver.a clangRewriteFrontend.a \
- clangRewriteCore.a clangParse.a clangSema.a clangAnalysis.a \
+ clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
include $(CLANG_LEVEL)/Makefile
diff --git a/clang-modernize/tool/Makefile b/clang-modernize/tool/Makefile
index 5f50d26..2d3a627 100644
--- a/clang-modernize/tool/Makefile
+++ b/clang-modernize/tool/Makefile
@@ -38,7 +38,7 @@
LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc mcparser option
USEDLIBS = modernizeCore.a clangFormat.a clangTooling.a clangFrontend.a \
clangSerialization.a clangDriver.a clangRewriteFrontend.a \
- clangRewriteCore.a clangParse.a clangSema.a clangAnalysis.a \
+ clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
include $(CLANG_LEVEL)/Makefile
diff --git a/clang-query/tool/Makefile b/clang-query/tool/Makefile
index 9da754a..f62b0b5 100644
--- a/clang-query/tool/Makefile
+++ b/clang-query/tool/Makefile
@@ -20,7 +20,7 @@
LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc mcparser option
USEDLIBS = clangQuery.a clangDynamicASTMatchers.a clangFormat.a clangTooling.a \
clangFrontend.a clangSerialization.a clangDriver.a clangRewriteFrontend.a \
- LLVMLineEditor.a clangRewriteCore.a clangParse.a clangSema.a clangAnalysis.a \
+ LLVMLineEditor.a clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
include $(CLANG_LEVEL)/Makefile
diff --git a/clang-tidy/CMakeLists.txt b/clang-tidy/CMakeLists.txt
index 01f5339..099d0b2 100644
--- a/clang-tidy/CMakeLists.txt
+++ b/clang-tidy/CMakeLists.txt
@@ -16,7 +16,7 @@
clangASTMatchers
clangBasic
clangFrontend
- clangRewriteCore
+ clangRewrite
clangSema
clangStaticAnalyzerCore
clangStaticAnalyzerFrontend
diff --git a/clang-tidy/tool/Makefile b/clang-tidy/tool/Makefile
index c63e23f..3d4cc44 100644
--- a/clang-tidy/tool/Makefile
+++ b/clang-tidy/tool/Makefile
@@ -22,7 +22,7 @@
clangStaticAnalyzerCore.a \
clangFormat.a clangASTMatchers.a clangTooling.a clangFrontend.a \
clangSerialization.a clangDriver.a clangParse.a clangSema.a \
- clangAnalysis.a clangRewriteFrontend.a clangRewriteCore.a \
+ clangAnalysis.a clangRewriteFrontend.a clangRewrite.a \
clangEdit.a clangAST.a clangLex.a clangBasic.a
include $(CLANG_LEVEL)/Makefile
diff --git a/remove-cstr-calls/Makefile b/remove-cstr-calls/Makefile
index d27b424..3162108 100644
--- a/remove-cstr-calls/Makefile
+++ b/remove-cstr-calls/Makefile
@@ -18,7 +18,7 @@
include $(CLANG_LEVEL)/../../Makefile.config
LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option
USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \
- clangRewriteFrontend.a clangRewriteCore.a \
+ clangRewriteFrontend.a clangRewrite.a \
clangParse.a clangSema.a clangAnalysis.a \
clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
diff --git a/tool-template/Makefile b/tool-template/Makefile
index 740de8f..fbc4e2f 100644
--- a/tool-template/Makefile
+++ b/tool-template/Makefile
@@ -18,7 +18,7 @@
include $(CLANG_LEVEL)/../../Makefile.config
LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option
USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \
- clangRewriteFrontend.a clangRewriteCore.a \
+ clangRewriteFrontend.a clangRewrite.a \
clangParse.a clangSema.a clangAnalysis.a \
clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
diff --git a/unittests/clang-apply-replacements/Makefile b/unittests/clang-apply-replacements/Makefile
index 16f0800..a92faa7 100644
--- a/unittests/clang-apply-replacements/Makefile
+++ b/unittests/clang-apply-replacements/Makefile
@@ -15,7 +15,7 @@
TransformUtils
USEDLIBS = clangApplyReplacements.a clangFormat.a clangTooling.a clangFrontend.a \
clangSerialization.a clangDriver.a clangRewriteFrontend.a \
- clangRewriteCore.a clangParse.a clangSema.a clangAnalysis.a \
+ clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
include $(CLANG_LEVEL)/Makefile
diff --git a/unittests/clang-modernize/Makefile b/unittests/clang-modernize/Makefile
index 71c3679..72ae213 100644
--- a/unittests/clang-modernize/Makefile
+++ b/unittests/clang-modernize/Makefile
@@ -15,7 +15,7 @@
TransformUtils
USEDLIBS = modernizeCore.a clangFormat.a clangApplyReplacements.a clangTooling.a clangFrontend.a \
clangSerialization.a clangDriver.a clangRewriteFrontend.a \
- clangRewriteCore.a clangParse.a clangSema.a clangAnalysis.a \
+ clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
clangAST.a clangASTMatchers.a clangEdit.a clangLex.a \
clangBasic.a
diff --git a/unittests/clang-tidy/Makefile b/unittests/clang-tidy/Makefile
index 7983226..57475ef 100644
--- a/unittests/clang-tidy/Makefile
+++ b/unittests/clang-tidy/Makefile
@@ -18,7 +18,7 @@
clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a \
clangStaticAnalyzerCore.a \
clangFormat.a clangTooling.a clangFrontend.a clangSerialization.a \
- clangDriver.a clangRewriteFrontend.a clangRewriteCore.a \
+ clangDriver.a clangRewriteFrontend.a clangRewrite.a \
clangParse.a clangSema.a clangAnalysis.a clangAST.a \
clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
