From 6392f5a9dfce2bf83617d49bb7f332181ec6004e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 25 May 2014 15:37:31 +0900 Subject: Revert "Finish renaming tdevelop components" This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73. --- buildtools/lib/base/CMakeLists.txt | 8 ++--- buildtools/lib/base/Mainpage.dox | 4 +-- buildtools/lib/base/Makefile.am | 16 ++++----- buildtools/lib/base/kdevbuildtool.cpp | 38 ++++++++++++++++++++ buildtools/lib/base/kdevbuildtool.h | 41 ++++++++++++++++++++++ buildtools/lib/base/tdevbuildtool.cpp | 38 -------------------- buildtools/lib/base/tdevbuildtool.h | 41 ---------------------- buildtools/lib/parsers/autotools/CMakeLists.txt | 4 +-- buildtools/lib/parsers/autotools/Makefile.am | 10 +++--- buildtools/lib/parsers/autotools/tests/Makefile.am | 4 +-- buildtools/lib/parsers/qmake/CMakeLists.txt | 4 +-- buildtools/lib/parsers/qmake/Makefile.am | 10 +++--- buildtools/lib/parsers/qmake/tests/Makefile.am | 4 +-- buildtools/lib/widgets/CMakeLists.txt | 4 +-- buildtools/lib/widgets/Makefile.am | 14 ++++---- 15 files changed, 120 insertions(+), 120 deletions(-) create mode 100644 buildtools/lib/base/kdevbuildtool.cpp create mode 100644 buildtools/lib/base/kdevbuildtool.h delete mode 100644 buildtools/lib/base/tdevbuildtool.cpp delete mode 100644 buildtools/lib/base/tdevbuildtool.h (limited to 'buildtools/lib') diff --git a/buildtools/lib/base/CMakeLists.txt b/buildtools/lib/base/CMakeLists.txt index a429be6c..f3585669 100644 --- a/buildtools/lib/base/CMakeLists.txt +++ b/buildtools/lib/base/CMakeLists.txt @@ -26,14 +26,14 @@ link_directories( ##### headers ################################### install( FILES - tdevbuildtool.h + kdevbuildtool.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/buildtools/base ) -##### tdevbuildbase (shared) #################### +##### kdevbuildbase (shared) #################### -tde_add_library( tdevbuildbase SHARED AUTOMOC - SOURCES tdevbuildtool.cpp +tde_add_library( kdevbuildbase SHARED AUTOMOC + SOURCES kdevbuildtool.cpp VERSION 0.0.0 LINK tdevelop-shared DESTINATION ${LIB_INSTALL_DIR} diff --git a/buildtools/lib/base/Mainpage.dox b/buildtools/lib/base/Mainpage.dox index 8a85d338..3e16d2d8 100644 --- a/buildtools/lib/base/Mainpage.dox +++ b/buildtools/lib/base/Mainpage.dox @@ -8,8 +8,8 @@ This library contains base classes for KDevelop builtool support plugins. Include path: -I\$(kde_includes)/tdevelop/buildtools/base \section btbaseoverview Overview -This library is created to provide TDevBuildTool compat class which can be used -as drop-in replacement of TDevProject class for buildtool support plugins +This library is created to provide KDevBuildTool compat class which can be used +as drop-in replacement of KDevProject class for buildtool support plugins written for old KDevelop architecture (before version 3.2). Nevertheless, it can be useful for new buildtool plugins as well because it provides diff --git a/buildtools/lib/base/Makefile.am b/buildtools/lib/base/Makefile.am index 6532398d..7e1083ef 100644 --- a/buildtools/lib/base/Makefile.am +++ b/buildtools/lib/base/Makefile.am @@ -2,14 +2,14 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets/propeditor \ $(all_includes) METASOURCES = AUTO -lib_LTLIBRARIES = libtdevbuildbase.la -libtdevbuildbase_la_LDFLAGS = $(all_libraries) -libtdevbuildbase_la_LIBADD = $(top_builddir)/lib/interfaces/libtdevinterfaces.la $(LIB_QT) $(LIB_TDEUI) -libtdevbuildbase_la_SOURCES = tdevbuildtool.cpp +lib_LTLIBRARIES = libkdevbuildbase.la +libkdevbuildbase_la_LDFLAGS = $(all_libraries) +libkdevbuildbase_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la $(LIB_QT) $(LIB_TDEUI) +libkdevbuildbase_la_SOURCES = kdevbuildtool.cpp tdevelopbuildtoolsincludedir = $(includedir)/tdevelop/buildtools/base -tdevelopbuildtoolsinclude_HEADERS = tdevbuildtool.h +tdevelopbuildtoolsinclude_HEADERS = kdevbuildtool.h -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevutil tdevinterfaces tdevextensions -DOXYGEN_PROJECTNAME = TDevelop Buildtool Base Library -DOXYGEN_DOCDIRPREFIX = tdevbt +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil kdevinterfaces kdevextensions +DOXYGEN_PROJECTNAME = KDevelop Buildtool Base Library +DOXYGEN_DOCDIRPREFIX = kdevbt include ../../../Doxyfile.am diff --git a/buildtools/lib/base/kdevbuildtool.cpp b/buildtools/lib/base/kdevbuildtool.cpp new file mode 100644 index 00000000..618f02d9 --- /dev/null +++ b/buildtools/lib/base/kdevbuildtool.cpp @@ -0,0 +1,38 @@ +/* This file is part of the KDE project + Copyright (C) 2004 Alexander Dymo + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ +#include "kdevbuildtool.h" + +#include +#include + +KDevBuildTool::KDevBuildTool(const KDevPluginInfo* info, TQObject* parent, const char* name) + :KDevProject(info, parent, name) +{ +} + +KDevMakeFrontend * KDevBuildTool::makeFrontend() +{ + return extension("TDevelop/MakeFrontend"); +} + +KDevAppFrontend * KDevBuildTool::appFrontend() +{ + return extension("TDevelop/AppFrontend"); +} + diff --git a/buildtools/lib/base/kdevbuildtool.h b/buildtools/lib/base/kdevbuildtool.h new file mode 100644 index 00000000..ff1abcc0 --- /dev/null +++ b/buildtools/lib/base/kdevbuildtool.h @@ -0,0 +1,41 @@ +/* This file is part of the KDE project + Copyright (C) 1999-2001 Bernd Gehrmann + Copyright (C) 2004 Alexander Dymo + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ +#ifndef KDEVBUILDTOOL_H +#define KDEVBUILDTOOL_H + +#include + +class KDevMakeFrontend; +class KDevAppFrontend; + +/**Base class for KDevelop build tool support plugins.*/ +class KDevBuildTool: public KDevProject +{ +public: + KDevBuildTool(const KDevPluginInfo* info, TQObject* parent, const char* name); + + /**@return The make frontend.*/ + KDevMakeFrontend *makeFrontend(); + /**@return The application frontend.*/ + KDevAppFrontend *appFrontend(); + +}; + +#endif diff --git a/buildtools/lib/base/tdevbuildtool.cpp b/buildtools/lib/base/tdevbuildtool.cpp deleted file mode 100644 index aa901bb7..00000000 --- a/buildtools/lib/base/tdevbuildtool.cpp +++ /dev/null @@ -1,38 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2004 Alexander Dymo - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ -#include "tdevbuildtool.h" - -#include -#include - -TDevBuildTool::TDevBuildTool(const TDevPluginInfo* info, TQObject* parent, const char* name) - :TDevProject(info, parent, name) -{ -} - -TDevMakeFrontend * TDevBuildTool::makeFrontend() -{ - return extension("TDevelop/MakeFrontend"); -} - -TDevAppFrontend * TDevBuildTool::appFrontend() -{ - return extension("TDevelop/AppFrontend"); -} - diff --git a/buildtools/lib/base/tdevbuildtool.h b/buildtools/lib/base/tdevbuildtool.h deleted file mode 100644 index b6899f9b..00000000 --- a/buildtools/lib/base/tdevbuildtool.h +++ /dev/null @@ -1,41 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 1999-2001 Bernd Gehrmann - Copyright (C) 2004 Alexander Dymo - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ -#ifndef TDEVBUILDTOOL_H -#define TDEVBUILDTOOL_H - -#include - -class TDevMakeFrontend; -class TDevAppFrontend; - -/**Base class for KDevelop build tool support plugins.*/ -class TDevBuildTool: public TDevProject -{ -public: - TDevBuildTool(const TDevPluginInfo* info, TQObject* parent, const char* name); - - /**@return The make frontend.*/ - TDevMakeFrontend *makeFrontend(); - /**@return The application frontend.*/ - TDevAppFrontend *appFrontend(); - -}; - -#endif diff --git a/buildtools/lib/parsers/autotools/CMakeLists.txt b/buildtools/lib/parsers/autotools/CMakeLists.txt index 5bc97247..8226e963 100644 --- a/buildtools/lib/parsers/autotools/CMakeLists.txt +++ b/buildtools/lib/parsers/autotools/CMakeLists.txt @@ -16,9 +16,9 @@ include_directories( ) -##### tdevautotoolsparser (static) ############## +##### kdevautotoolsparser (static) ############## -tde_add_library( tdevautotoolsparser STATIC_PIC +tde_add_library( kdevautotoolsparser STATIC_PIC SOURCES autotoolsast.cpp autotoolsdriver.cpp autotools_yacc.cpp ) diff --git a/buildtools/lib/parsers/autotools/Makefile.am b/buildtools/lib/parsers/autotools/Makefile.am index 47234583..340d0e38 100644 --- a/buildtools/lib/parsers/autotools/Makefile.am +++ b/buildtools/lib/parsers/autotools/Makefile.am @@ -6,9 +6,9 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets/propeditor \ $(all_includes) METASOURCES = AUTO -noinst_LTLIBRARIES = libtdevautotoolsparser.la -libtdevautotoolsparser_la_LDFLAGS = $(all_libraries) $(LIB_TDEIO) -libtdevautotoolsparser_la_SOURCES = autotoolsast.cpp autotoolsdriver.cpp autotools_yacc.cpp +noinst_LTLIBRARIES = libkdevautotoolsparser.la +libkdevautotoolsparser_la_LDFLAGS = $(all_libraries) $(LIB_TDEIO) +libkdevautotoolsparser_la_SOURCES = autotoolsast.cpp autotoolsdriver.cpp autotools_yacc.cpp parser: cd $(srcdir) ; \ @@ -19,6 +19,6 @@ parser: EXTRA_DIST = autotools.yy autotools.ll DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils -DOXYGEN_PROJECTNAME = TDevelop AutoTools Parser -DOXYGEN_DOCDIRPREFIX = tdevparser +DOXYGEN_PROJECTNAME = KDevelop AutoTools Parser +DOXYGEN_DOCDIRPREFIX = kdevparser include ../../../../Doxyfile.am diff --git a/buildtools/lib/parsers/autotools/tests/Makefile.am b/buildtools/lib/parsers/autotools/tests/Makefile.am index 00c2baba..30c67288 100644 --- a/buildtools/lib/parsers/autotools/tests/Makefile.am +++ b/buildtools/lib/parsers/autotools/tests/Makefile.am @@ -13,9 +13,9 @@ METASOURCES = AUTO check_PROGRAMS = runner viewer runner_LDFLAGS = $(all_libraries) $(LIB_TDECORE) $(KDE_RPATH) -runner_LDADD = $(top_builddir)/buildtools/lib/parsers/autotools/libtdevautotoolsparser.la +runner_LDADD = $(top_builddir)/buildtools/lib/parsers/autotools/libkdevautotoolsparser.la runner_SOURCES = runner.cpp viewer_LDFLAGS = $(all_libraries) $(LIB_TDECORE) $(KDE_RPATH) -viewer_LDADD = $(top_builddir)/buildtools/lib/parsers/autotools/libtdevautotoolsparser.la +viewer_LDADD = $(top_builddir)/buildtools/lib/parsers/autotools/libkdevautotoolsparser.la viewer_SOURCES = viewer.cpp viewer_main.cpp viewerbase.ui diff --git a/buildtools/lib/parsers/qmake/CMakeLists.txt b/buildtools/lib/parsers/qmake/CMakeLists.txt index 6ffebfa6..b8328a84 100644 --- a/buildtools/lib/parsers/qmake/CMakeLists.txt +++ b/buildtools/lib/parsers/qmake/CMakeLists.txt @@ -27,9 +27,9 @@ install( FILES DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/buildtools/parsers/qmake ) -##### tdevqmakeparser (shared) ################## +##### kdevqmakeparser (shared) ################## -tde_add_library( tdevqmakeparser SHARED +tde_add_library( kdevqmakeparser SHARED SOURCES qmake_lex.cpp qmake_yacc.cpp qmakeast.cpp qmakeastvisitor.cpp qmakedriver.cpp diff --git a/buildtools/lib/parsers/qmake/Makefile.am b/buildtools/lib/parsers/qmake/Makefile.am index 9e14382a..ff3f175b 100644 --- a/buildtools/lib/parsers/qmake/Makefile.am +++ b/buildtools/lib/parsers/qmake/Makefile.am @@ -8,9 +8,9 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets/propeditor \ $(all_includes) METASOURCES = AUTO -lib_LTLIBRARIES = libtdevqmakeparser.la -libtdevqmakeparser_la_LDFLAGS = -no-undefined $(all_libraries) $(LIB_TDEIO) -libtdevqmakeparser_la_SOURCES = qmake_lex.cpp qmake_yacc.cpp qmakeast.cpp \ +lib_LTLIBRARIES = libkdevqmakeparser.la +libkdevqmakeparser_la_LDFLAGS = -no-undefined $(all_libraries) $(LIB_TDEIO) +libkdevqmakeparser_la_SOURCES = qmake_lex.cpp qmake_yacc.cpp qmakeast.cpp \ qmakeastvisitor.cpp qmakedriver.cpp tdevelopbuildtoolsincludedir = $(includedir)/tdevelop/buildtools/parsers/qmake @@ -24,8 +24,8 @@ parser: EXTRA_DIST = qmake.yy qmake.ll DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils -DOXYGEN_PROJECTNAME = TDevelop QMake parser -DOXYGEN_DOCDIRPREFIX = tdevparser +DOXYGEN_PROJECTNAME = KDevelop QMake parser +DOXYGEN_DOCDIRPREFIX = kdevparser include ../../../../Doxyfile.am noinst_HEADERS = qmake.ll qmake.yy qmake_lex.h diff --git a/buildtools/lib/parsers/qmake/tests/Makefile.am b/buildtools/lib/parsers/qmake/tests/Makefile.am index 74935269..e1932f7e 100644 --- a/buildtools/lib/parsers/qmake/tests/Makefile.am +++ b/buildtools/lib/parsers/qmake/tests/Makefile.am @@ -13,9 +13,9 @@ METASOURCES = AUTO noinst_PROGRAMS = runner viewer runner_LDFLAGS = $(all_libraries) $(LIB_TDECORE) $(KDE_RPATH) -runner_LDADD = $(top_builddir)/buildtools/lib/parsers/qmake/libtdevqmakeparser.la +runner_LDADD = $(top_builddir)/buildtools/lib/parsers/qmake/libkdevqmakeparser.la runner_SOURCES = runner.cpp viewer_LDFLAGS = --no-undefined $(all_libraries) $(LIB_TDECORE) $(KDE_RPATH) -viewer_LDADD = $(top_builddir)/buildtools/lib/parsers/qmake/libtdevqmakeparser.la +viewer_LDADD = $(top_builddir)/buildtools/lib/parsers/qmake/libkdevqmakeparser.la viewer_SOURCES = viewer.cpp viewer_main.cpp viewerbase.ui diff --git a/buildtools/lib/widgets/CMakeLists.txt b/buildtools/lib/widgets/CMakeLists.txt index 0349f6d3..d86d0c66 100644 --- a/buildtools/lib/widgets/CMakeLists.txt +++ b/buildtools/lib/widgets/CMakeLists.txt @@ -36,9 +36,9 @@ install( FILES DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/buildtools/widgets ) -##### tdevbuildtoolswidgets (shared) ############ +##### kdevbuildtoolswidgets (shared) ############ -tde_add_library( tdevbuildtoolswidgets SHARED AUTOMOC +tde_add_library( kdevbuildtoolswidgets SHARED AUTOMOC SOURCES addenvvardlg.cpp addfilesdialog.cpp environmentdisplaydialog.cpp diff --git a/buildtools/lib/widgets/Makefile.am b/buildtools/lib/widgets/Makefile.am index 718bbb04..6042ea06 100644 --- a/buildtools/lib/widgets/Makefile.am +++ b/buildtools/lib/widgets/Makefile.am @@ -5,11 +5,11 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \ -I$(top_srcdir)/lib/widgets/propeditor $(all_includes) -lib_LTLIBRARIES = libtdevbuildtoolswidgets.la -libtdevbuildtoolswidgets_la_LDFLAGS = $(all_libraries) -libtdevbuildtoolswidgets_la_LIBADD = $(top_builddir)/lib/interfaces/libtdevinterfaces.la \ +lib_LTLIBRARIES = libkdevbuildtoolswidgets.la +libkdevbuildtoolswidgets_la_LDFLAGS = $(all_libraries) +libkdevbuildtoolswidgets_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la \ $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -ltdetexteditor -libtdevbuildtoolswidgets_la_SOURCES = addenvvardlg.cpp addfilesdialog.cpp \ +libkdevbuildtoolswidgets_la_SOURCES = addenvvardlg.cpp addfilesdialog.cpp \ environmentdisplaydialog.cpp environmentdisplaydialogbase.ui environmentvariableswidget.cpp \ environmentvariableswidgetbase.ui envvartools.cpp makeoptionswidget.cpp makeoptionswidgetbase.ui \ removesubprojectdialog.cpp removesubprojectdlgbase.ui runoptionswidget.cpp runoptionswidgetbase.ui \ @@ -23,8 +23,8 @@ tdevelopbuildtoolsinclude_HEADERS = addenvvardlg.h addfilesdialog.h \ makeoptionswidgetbase.h removesubprojectdialog.h removesubprojectdlgbase.h runoptionswidget.h \ runoptionswidgetbase.h subclassesdlg.h subclassesdlgbase.h -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevutil tdevinterfaces tdevutil -DOXYGEN_PROJECTNAME = TDevelop Buildtool Widgets Library -DOXYGEN_DOCDIRPREFIX = tdevbt +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil kdevinterfaces kdevutil +DOXYGEN_PROJECTNAME = KDevelop Buildtool Widgets Library +DOXYGEN_DOCDIRPREFIX = kdevbt include ../../../Doxyfile.am noinst_HEADERS = environmentdisplaydialog.h -- cgit v1.2.3