From e208dfc2afb5d2460200e50dfcaab6e03459bf22 Mon Sep 17 00:00:00 2001 From: Alp Toker Date: Wed, 16 Jul 2014 16:50:17 +0000 Subject: [PATCH] Track clang r213171 The clang rewriter is now a core facility. llvm-svn: 213172 --- clang-tools-extra/CMakeLists.txt | 4 +--- clang-tools-extra/clang-apply-replacements/CMakeLists.txt | 2 +- .../clang-apply-replacements/tool/CMakeLists.txt | 2 +- clang-tools-extra/clang-apply-replacements/tool/Makefile | 2 +- clang-tools-extra/clang-modernize/tool/Makefile | 2 +- clang-tools-extra/clang-query/tool/Makefile | 2 +- clang-tools-extra/clang-tidy/CMakeLists.txt | 2 +- clang-tools-extra/clang-tidy/tool/Makefile | 2 +- clang-tools-extra/remove-cstr-calls/Makefile | 2 +- clang-tools-extra/tool-template/Makefile | 2 +- clang-tools-extra/unittests/clang-apply-replacements/Makefile | 2 +- clang-tools-extra/unittests/clang-modernize/Makefile | 2 +- clang-tools-extra/unittests/clang-tidy/Makefile | 2 +- 13 files changed, 13 insertions(+), 15 deletions(-) diff --git a/clang-tools-extra/CMakeLists.txt b/clang-tools-extra/CMakeLists.txt index 33a5ce9a3683..1f2132f25c08 100644 --- a/clang-tools-extra/CMakeLists.txt +++ b/clang-tools-extra/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_subdirectory(tool-template) # 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-tools-extra/clang-apply-replacements/CMakeLists.txt b/clang-tools-extra/clang-apply-replacements/CMakeLists.txt index 2458fc0ec802..6c409655583f 100644 --- a/clang-tools-extra/clang-apply-replacements/CMakeLists.txt +++ b/clang-tools-extra/clang-apply-replacements/CMakeLists.txt @@ -7,7 +7,7 @@ add_clang_library(clangApplyReplacements LINK_LIBS clangBasic - clangRewriteCore + clangRewrite clangTooling ) diff --git a/clang-tools-extra/clang-apply-replacements/tool/CMakeLists.txt b/clang-tools-extra/clang-apply-replacements/tool/CMakeLists.txt index 8baa0e508371..e3d11feb30a1 100644 --- a/clang-tools-extra/clang-apply-replacements/tool/CMakeLists.txt +++ b/clang-tools-extra/clang-apply-replacements/tool/CMakeLists.txt @@ -9,7 +9,7 @@ target_link_libraries(clang-apply-replacements clangApplyReplacements clangBasic clangFormat - clangRewriteCore + clangRewrite clangTooling ) diff --git a/clang-tools-extra/clang-apply-replacements/tool/Makefile b/clang-tools-extra/clang-apply-replacements/tool/Makefile index 97d9927dcd0b..6947f8fad219 100644 --- a/clang-tools-extra/clang-apply-replacements/tool/Makefile +++ b/clang-tools-extra/clang-apply-replacements/tool/Makefile @@ -20,7 +20,7 @@ SOURCES = ClangApplyReplacementsMain.cpp 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-tools-extra/clang-modernize/tool/Makefile b/clang-tools-extra/clang-modernize/tool/Makefile index 5f50d2634eff..2d3a6277de25 100644 --- a/clang-tools-extra/clang-modernize/tool/Makefile +++ b/clang-tools-extra/clang-modernize/tool/Makefile @@ -38,7 +38,7 @@ BUILT_SOURCES += $(ObjDir)/../ReplaceAutoPtr/.objdir 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-tools-extra/clang-query/tool/Makefile b/clang-tools-extra/clang-query/tool/Makefile index 9da754a9bb87..f62b0b541313 100644 --- a/clang-tools-extra/clang-query/tool/Makefile +++ b/clang-tools-extra/clang-query/tool/Makefile @@ -20,7 +20,7 @@ SOURCES = ClangQuery.cpp 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-tools-extra/clang-tidy/CMakeLists.txt b/clang-tools-extra/clang-tidy/CMakeLists.txt index 01f533985c5e..099d0b284b56 100644 --- a/clang-tools-extra/clang-tidy/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/CMakeLists.txt @@ -16,7 +16,7 @@ add_clang_library(clangTidy clangASTMatchers clangBasic clangFrontend - clangRewriteCore + clangRewrite clangSema clangStaticAnalyzerCore clangStaticAnalyzerFrontend diff --git a/clang-tools-extra/clang-tidy/tool/Makefile b/clang-tools-extra/clang-tidy/tool/Makefile index c63e23f850cc..3d4cc444306a 100644 --- a/clang-tools-extra/clang-tidy/tool/Makefile +++ b/clang-tools-extra/clang-tidy/tool/Makefile @@ -22,7 +22,7 @@ USEDLIBS = clangTidy.a clangTidyLLVMModule.a clangTidyGoogleModule.a \ 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/clang-tools-extra/remove-cstr-calls/Makefile b/clang-tools-extra/remove-cstr-calls/Makefile index d27b4244dd13..316210891764 100644 --- a/clang-tools-extra/remove-cstr-calls/Makefile +++ b/clang-tools-extra/remove-cstr-calls/Makefile @@ -18,7 +18,7 @@ TOOL_NO_EXPORTS = 1 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/clang-tools-extra/tool-template/Makefile b/clang-tools-extra/tool-template/Makefile index 740de8f53c65..fbc4e2f09b22 100644 --- a/clang-tools-extra/tool-template/Makefile +++ b/clang-tools-extra/tool-template/Makefile @@ -18,7 +18,7 @@ TOOL_NO_EXPORTS = 1 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/clang-tools-extra/unittests/clang-apply-replacements/Makefile b/clang-tools-extra/unittests/clang-apply-replacements/Makefile index 16f0800a688a..a92faa761817 100644 --- a/clang-tools-extra/unittests/clang-apply-replacements/Makefile +++ b/clang-tools-extra/unittests/clang-apply-replacements/Makefile @@ -15,7 +15,7 @@ LINK_COMPONENTS := asmparser bitreader support mc mcparser option \ 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/clang-tools-extra/unittests/clang-modernize/Makefile b/clang-tools-extra/unittests/clang-modernize/Makefile index 71c36793e63c..72ae21372233 100644 --- a/clang-tools-extra/unittests/clang-modernize/Makefile +++ b/clang-tools-extra/unittests/clang-modernize/Makefile @@ -15,7 +15,7 @@ LINK_COMPONENTS := asmparser bitreader support MC MCParser option \ 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/clang-tools-extra/unittests/clang-tidy/Makefile b/clang-tools-extra/unittests/clang-tidy/Makefile index 79832262c447..57475efc4181 100644 --- a/clang-tools-extra/unittests/clang-tidy/Makefile +++ b/clang-tools-extra/unittests/clang-tidy/Makefile @@ -18,7 +18,7 @@ USEDLIBS = clangTidy.a clangTidyLLVMModule.a clangTidyGoogleModule.a \ 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