C++: Clean up dev tools

* Move cplusplus-frontend to src/tools
* Make them depend on libs/cplusplus instead of building that lib again
* Put the binaries into bin of the qtcreator build directory
* Unify *.pro files
* Build them all if BUILD_CPLUSPLUS_TOOLS is set

Change-Id: I8f9cd731625cbf9f41d5f6464c6cd946ffd6e141
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

21 files changed, 49 insertions, 84 deletions

diff --git a/.gitignore b/.gitignore
index 3175950117..9bcee95b54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -118,6 +118,10 @@ tmp/
 *.exe
 /bin/buildoutputparser
 /bin/cpaster
+/bin/cplusplus-ast2png
+/bin/cplusplus-frontend
+/bin/cplusplus-mkvisitor
+/bin/cplusplus-update-frontend
 /bin/qbs*
 /bin/qmlpuppet
 /bin/qml2puppet
@@ -129,20 +133,16 @@ tmp/
 /bin/sdktool
 /share/doc/qtcreator/*.qch
 /share/qtcreator/qbs/
-/src/tools/cplusplus-mkvisitor/cplusplus-mkvisitor
-/src/tools/cplusplus-update-frontend/cplusplus-update-frontend
 /src/tools/qml/qmldump/qmldump
 /src/tools/examplesscanner/examplesscanner
 /src/tools/valgrindfake/valgrind-fake
 
 # Tests
 #------
-/tests/manual/cplusplus-frontend/cplusplus-frontend
 /tests/manual/qml-ast2dot/qml-ast2dot
 /tests/manual/debugger/simple/libsimple_test_plugin.*dylib
 /tests/manual/debugger/simple/simple_test_app
 /tests/manual/preprocessor/pp
-/tests/tools/cplusplus-ast2png/cplusplus-ast2png
 /tests/auto/aggregation/tst_aggregation
 /tests/auto/changeset/tst_changeset
 /tests/auto/cplusplus/checksymbols/tst_checksymbols
diff --git a/tests/tools/cplusplus-ast2png/cplusplus-ast2png.cpp b/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp
index 2fb1e3bcc4..fa44245c8f 100644
--- a/tests/tools/cplusplus-ast2png/cplusplus-ast2png.cpp
+++ b/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp
@@ -43,7 +43,7 @@
 #include <cplusplus/Symbols.h>
 #include <cplusplus/TranslationUnit.h>
 
-#include "cplusplus-tools-utils.h"
+#include "utils.h"
 
 #include <QDir>
 #include <QFile>
diff --git a/src/tools/cplusplus-ast2png/cplusplus-ast2png.pro b/src/tools/cplusplus-ast2png/cplusplus-ast2png.pro
new file mode 100644
index 0000000000..2178100684
--- /dev/null
+++ b/src/tools/cplusplus-ast2png/cplusplus-ast2png.pro
@@ -0,0 +1,4 @@
+include(../cplusplus-shared/tool.pri)
+include(../cplusplus-shared/utils.pri)
+
+SOURCES += cplusplus-ast2png.cpp
diff --git a/tests/tools/cplusplus-ast2png/dumpers.inc b/src/tools/cplusplus-ast2png/dumpers.inc
index 5e5bb1a10b..5e5bb1a10b 100644
--- a/tests/tools/cplusplus-ast2png/dumpers.inc
+++ b/src/tools/cplusplus-ast2png/dumpers.inc
diff --git a/tests/tools/cplusplus-ast2png/tests/templ01.cpp b/src/tools/cplusplus-ast2png/tests/templ01.cpp
index 646794618f..646794618f 100644
--- a/tests/tools/cplusplus-ast2png/tests/templ01.cpp
+++ b/src/tools/cplusplus-ast2png/tests/templ01.cpp
diff --git a/tests/manual/cplusplus-frontend/cplusplus-frontend.cpp b/src/tools/cplusplus-frontend/cplusplus-frontend.cpp
index 2ec674f356..96bb4120ee 100644
--- a/tests/manual/cplusplus-frontend/cplusplus-frontend.cpp
+++ b/src/tools/cplusplus-frontend/cplusplus-frontend.cpp
@@ -41,7 +41,7 @@
 #include <cplusplus/Symbols.h>
 #include <cplusplus/TranslationUnit.h>
 
-#include "cplusplus-tools-utils.h"
+#include "utils.h"
 
 #include <QFile>
 #include <QList>
diff --git a/src/tools/cplusplus-frontend/cplusplus-frontend.pro b/src/tools/cplusplus-frontend/cplusplus-frontend.pro
new file mode 100644
index 0000000000..4ab5b86dc5
--- /dev/null
+++ b/src/tools/cplusplus-frontend/cplusplus-frontend.pro
@@ -0,0 +1,4 @@
+include(../cplusplus-shared/tool.pri)
+include(../cplusplus-shared/utils.pri)
+
+SOURCES += cplusplus-frontend.cpp
diff --git a/tests/manual/cplusplus-frontend/tests/t1.cpp b/src/tools/cplusplus-frontend/tests/t1.cpp
index f07b248ff5..f07b248ff5 100644
--- a/tests/manual/cplusplus-frontend/tests/t1.cpp
+++ b/src/tools/cplusplus-frontend/tests/t1.cpp
diff --git a/src/tools/cplusplus-mkvisitor/cplusplus-mkvisitor.cpp b/src/tools/cplusplus-mkvisitor/cplusplus-mkvisitor.cpp
index 0e7e3a1667..747d71ded5 100644
--- a/src/tools/cplusplus-mkvisitor/cplusplus-mkvisitor.cpp
+++ b/src/tools/cplusplus-mkvisitor/cplusplus-mkvisitor.cpp
@@ -45,7 +45,7 @@
 #include <cplusplus/Overview.h>
 #include <cplusplus/LookupContext.h>
 
-#include "cplusplus-tools-utils.h"
+#include "utils.h"
 
 #include <QFile>
 #include <QList>
diff --git a/src/tools/cplusplus-mkvisitor/cplusplus-mkvisitor.pro b/src/tools/cplusplus-mkvisitor/cplusplus-mkvisitor.pro
index aa942fc5fa..905e0570be 100644
--- a/src/tools/cplusplus-mkvisitor/cplusplus-mkvisitor.pro
+++ b/src/tools/cplusplus-mkvisitor/cplusplus-mkvisitor.pro
@@ -1,13 +1,6 @@
-QT = core gui
-macx:CONFIG -= app_bundle
-win32:CONFIG += console
-TEMPLATE = app
-TARGET = cplusplus-mkvisitor
-DESTDIR = ./
-
-include(../../../qtcreator.pri)
-include(../../libs/cplusplus/cplusplus-lib.pri)
-include(../../../src/tools/cplusplus-tools-utils/cplusplus-tools-utils.pri)
+include(../cplusplus-shared/tool.pri)
+include(../cplusplus-shared/utils.pri)
 
 DEFINES += PATH_AST_H=\\\"$$PWD/../../libs/3rdparty/cplusplus/AST.h\\\"
+
 SOURCES += cplusplus-mkvisitor.cpp
diff --git a/src/tools/cplusplus-tools-utils/pp-configuration.inc b/src/tools/cplusplus-shared/pp-configuration.inc
index 5d6b0678c9..5d6b0678c9 100644
--- a/src/tools/cplusplus-tools-utils/pp-configuration.inc
+++ b/src/tools/cplusplus-shared/pp-configuration.inc
diff --git a/src/tools/cplusplus-shared/tool.pri b/src/tools/cplusplus-shared/tool.pri
new file mode 100644
index 0000000000..5f3e5e80fa
--- /dev/null
+++ b/src/tools/cplusplus-shared/tool.pri
@@ -0,0 +1,13 @@
+QTC_LIB_DEPENDS += cplusplus
+
+include(../../../qtcreator.pri)
+include(../../rpath.pri)
+
+DESTDIR = $$IDE_BIN_PATH
+
+QT = core gui
+TEMPLATE = app
+
+osx:CONFIG -= app_bundle
+win32:CONFIG += console
+win32:LIBS += -luser32 -lshell32
diff --git a/src/tools/cplusplus-tools-utils/cplusplus-tools-utils.cpp b/src/tools/cplusplus-shared/utils.cpp
index 0a549d3ac0..cad05e1131 100644
--- a/src/tools/cplusplus-tools-utils/cplusplus-tools-utils.cpp
+++ b/src/tools/cplusplus-shared/utils.cpp
@@ -29,7 +29,7 @@
 ****************************************************************************/
 
 
-#include "cplusplus-tools-utils.h"
+#include "utils.h"
 
 #include <utils/environment.h>
 
diff --git a/src/tools/cplusplus-tools-utils/cplusplus-tools-utils.h b/src/tools/cplusplus-shared/utils.h
index a65a0a8e4b..a65a0a8e4b 100644
--- a/src/tools/cplusplus-tools-utils/cplusplus-tools-utils.h
+++ b/src/tools/cplusplus-shared/utils.h
diff --git a/src/tools/cplusplus-shared/utils.pri b/src/tools/cplusplus-shared/utils.pri
new file mode 100644
index 0000000000..69e2e2bb3c
--- /dev/null
+++ b/src/tools/cplusplus-shared/utils.pri
@@ -0,0 +1,6 @@
+INCLUDEPATH += $$PWD
+
+DEFINES += PATH_PREPROCESSOR_CONFIG=\\\"$$PWD/pp-configuration.inc\\\"
+
+HEADERS += $$PWD/utils.h
+SOURCES += $$PWD/utils.cpp
diff --git a/src/tools/cplusplus-tools-utils/cplusplus-tools-utils.pri b/src/tools/cplusplus-tools-utils/cplusplus-tools-utils.pri
deleted file mode 100644
index 3a75d4b9c0..0000000000
--- a/src/tools/cplusplus-tools-utils/cplusplus-tools-utils.pri
+++ /dev/null
@@ -1,25 +0,0 @@
-DEPENDPATH += $$PWD
-INCLUDEPATH += $$PWD
-
-DEFINES *= QT_NO_CAST_FROM_ASCII
-DEFINES += PATH_PREPROCESSOR_CONFIG=\\\"$$PWD/pp-configuration.inc\\\"
-DEFINES += QTCREATOR_UTILS_STATIC_LIB
-
-HEADERS += \
-    $$PWD/cplusplus-tools-utils.h \
-    $$PWD/../../libs/utils/environment.h \
-    $$PWD/../../libs/utils/fileutils.h \
-    $$PWD/../../libs/utils/qtcassert.h \
-    $$PWD/../../libs/utils/savefile.h
-
-SOURCES += \
-    $$PWD/cplusplus-tools-utils.cpp \
-    $$PWD/../../libs/utils/environment.cpp \
-    $$PWD/../../libs/utils/fileutils.cpp \
-    $$PWD/../../libs/utils/qtcassert.cpp \
-    $$PWD/../../libs/utils/savefile.cpp
-
-win32:LIBS += -luser32 -lshell32
-
-osx:OBJECTIVE_SOURCES += $$PWD/../../libs/utils/fileutils_mac.mm
-osx:LIBS += -framework Foundation
diff --git a/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.pro b/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.pro
index a8ad3d6bb5..6b4f996842 100644
--- a/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.pro
+++ b/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.pro
@@ -1,18 +1,6 @@
-QTC_LIB_DEPENDS += utils
-
-include(../../../qtcreator.pri)
-include(../../libs/cplusplus/cplusplus-lib.pri)
-
-DESTDIR = $$IDE_BIN_PATH
-
-include(../../rpath.pri)
-
-QT = core gui
-macx:CONFIG -= app_bundle
-win32:CONFIG += console
-TEMPLATE = app
-TARGET = cplusplus-update-frontend
+include(../cplusplus-shared/tool.pri)
 
 DEFINES += PATH_CPP_FRONTEND=\\\"$$PWD/../../libs/3rdparty/cplusplus\\\"
-DEFINES += PATH_DUMPERS_FILE=\\\"$$PWD/../../../tests/tools/cplusplus-ast2png/dumpers.inc\\\"
+DEFINES += PATH_DUMPERS_FILE=\\\"$$PWD/../cplusplus-ast2png/dumpers.inc\\\"
+
 SOURCES += cplusplus-update-frontend.cpp
diff --git a/src/tools/tools.pro b/src/tools/tools.pro
index 218f3c7e9e..bb82504d14 100644
--- a/src/tools/tools.pro
+++ b/src/tools/tools.pro
@@ -19,6 +19,14 @@ mac {
     SUBDIRS += iostool
 }
 
+BUILD_CPLUSPLUS_TOOLS = $$(BUILD_CPLUSPLUS_TOOLS)
+!isEmpty(BUILD_CPLUSPLUS_TOOLS) {
+    SUBDIRS += cplusplus-ast2png \
+        cplusplus-frontend \
+        cplusplus-mkvisitor \
+        cplusplus-update-frontend
+}
+
 QT_BREAKPAD_ROOT_PATH = $$(QT_BREAKPAD_ROOT_PATH)
 !isEmpty(QT_BREAKPAD_ROOT_PATH) {
     SUBDIRS += qtcrashhandler
diff --git a/tests/manual/cplusplus-frontend/cplusplus-frontend.pro b/tests/manual/cplusplus-frontend/cplusplus-frontend.pro
deleted file mode 100644
index c2a6300ca0..0000000000
--- a/tests/manual/cplusplus-frontend/cplusplus-frontend.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-QT = core gui
-macx:CONFIG -= app_bundle
-win32:CONFIG += console
-TEMPLATE = app
-TARGET = cplusplus-frontend
-DESTDIR = ./
-
-include(../../../qtcreator.pri)
-include($$IDE_SOURCE_TREE/src/libs/cplusplus/cplusplus-lib.pri)
-include($$IDE_SOURCE_TREE/tests/auto/qttestrpath.pri)
-include(../../../src/tools/cplusplus-tools-utils/cplusplus-tools-utils.pri)
-
-SOURCES += cplusplus-frontend.cpp
diff --git a/tests/tools/cplusplus-ast2png/cplusplus-ast2png.pro b/tests/tools/cplusplus-ast2png/cplusplus-ast2png.pro
deleted file mode 100644
index 8a0fd726ad..0000000000
--- a/tests/tools/cplusplus-ast2png/cplusplus-ast2png.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-QT = core gui
-macx:CONFIG -= app_bundle
-win32:CONFIG += console
-TEMPLATE = app
-TARGET = cplusplus-ast2png
-DESTDIR = ./
-
-include(../../../qtcreator.pri)
-include(../../../src/libs/cplusplus/cplusplus-lib.pri)
-include(../../../src/tools/cplusplus-tools-utils/cplusplus-tools-utils.pri)
-
-SOURCES += cplusplus-ast2png.cpp
diff --git a/tests/tools/tools.pro b/tests/tools/tools.pro
index f54f92d40c..6f242df7bc 100644
--- a/tests/tools/tools.pro
+++ b/tests/tools/tools.pro
@@ -1,5 +1,4 @@
 TEMPLATE=subdirs
 
 SUBDIRS= \
-cplusplus-ast2png \
 qml-ast2dot