KDE/kdevelop

Andreas Pakulat apaku at gmx.de
Tue Nov 25 21:42:35 UTC 2008 

SVN commit 889058 by apaku:

Unify the structure of directories by putting all plugins into the plugins subdirectory, possibly grouping them (i.e. languages, builders, formatters, managers are still there).
CCMAIL:kdevelop-devel at kdevelop.org


 M  +0 -2      CMakeLists.txt  
 D             buildtools/builders (directory)  
 D             buildtools/managers (directory)  
 D             languages (directory)  
 M  +3 -0      plugins/CMakeLists.txt  
 AM            plugins/builders (directory)   buildtools/builders#889035
 M  +1 -1      plugins/builders/cmakebuilder/CMakeLists.txt  
 AM            plugins/builders/cmakebuilder/Messages.sh   buildtools/builders/cmakebuilder/Messages.sh#889054
 AM            plugins/builders/makebuilder/Messages.sh   buildtools/builders/makebuilder/Messages.sh#889054
 M  +1 -1      plugins/builders/qmakebuilder/CMakeLists.txt  
 AM            plugins/builders/qmakebuilder/Messages.sh   buildtools/builders/qmakebuilder/Messages.sh#889054
 AM            plugins/languages (directory)   languages#889035
 M  +2 -2      plugins/languages/cpp/CMakeLists.txt  
 AM            plugins/languages/cpp/Messages.sh   languages/cpp/Messages.sh#889054
 M  +2 -2      plugins/languages/cpp/cppduchain/CMakeLists.txt  
 M  +3 -2      plugins/languages/cpp/cppduchain/tests/CMakeLists.txt  
 AM            plugins/languages/cpp/debugger/Messages.sh   languages/cpp/debugger/Messages.sh#889054
 M  +1 -1      plugins/languages/cpp/parser/rpp/tests/CMakeLists.txt  
 M  +3 -3      plugins/languages/cpp/tests/CMakeLists.txt  
 M  +2 -2      plugins/languages/cpp/veritas/CMakeLists.txt  
 M  +1 -1      plugins/languages/cpp/veritas/stubconstructor.cpp  
 M  +1 -1      plugins/languages/cpp/veritas/stubcontextaction.cpp  
 M  +8 -8      plugins/languages/cpp/veritas/tests/classdeclarationfactory.cpp  
 M  +1 -1      plugins/languages/cpp/veritas/tests/classdeclarationfactory.h  
 M  +1 -1      plugins/languages/cpp/veritas/tests/stubcreationtest.cpp  
 M  +3 -3      plugins/languages/cpp/veritas/testswitch.cpp  
 M  +1 -1      plugins/languages/cpp/veritas/testswitch.h  
 M  +2 -2      plugins/languages/cpp/veritas/uutconstructor.cpp  
 M  +1 -1      plugins/languages/cpp/veritas/uutcontextaction.cpp  
 AM            plugins/managers (directory)   buildtools/managers#889035
 M  +1 -1      plugins/managers/cmake/CMakeLists.txt  
 AM            plugins/managers/cmake/Messages.sh   buildtools/managers/cmake/Messages.sh#889054
 M  +2 -2      plugins/managers/cmake/tests/CMakeLists.txt  
 M  +1 -1      plugins/managers/custommake/CMakeLists.txt  
 AM            plugins/managers/custommake/Messages.sh   buildtools/managers/custommake/Messages.sh#889054
 M  +1 -1      plugins/managers/qmake/CMakeLists.txt  
 AM            plugins/managers/qmake/Messages.sh   buildtools/managers/qmake/Messages.sh#889054


--- trunk/KDE/kdevelop/CMakeLists.txt #889057:889058
@@ -31,9 +31,7 @@
 add_subdirectory(cmake)
 add_subdirectory(pics)
 add_subdirectory(src)
-add_subdirectory(languages)
 add_subdirectory(plugins)
-add_subdirectory(buildtools)
 macro_optional_add_subdirectory(doc)
 
 macro_display_feature_log()
--- trunk/KDE/kdevelop/plugins/CMakeLists.txt #889057:889058
@@ -1,3 +1,6 @@
+add_subdirectory(builders)
+add_subdirectory(managers)
+add_subdirectorY(languages)
 add_subdirectory(appwizard)
 add_subdirectory(documentview)
 add_subdirectory(valgrind)
** trunk/KDE/kdevelop/plugins/builders #property svn:ignore
   + Makefile
Makefile.in
--- trunk/KDE/kdevelop/plugins/builders/cmakebuilder/CMakeLists.txt #889035:889058
@@ -1,7 +1,7 @@
 
 add_definitions( -DKDE_DEFAULT_DEBUG_AREA=9032 )
 include_directories(
-    ${CMAKE_SOURCE_DIR}/buildtools/builders/makebuilder
+    ${CMAKE_SOURCE_DIR}/plugins/builders/makebuilder
     )
 
 
** trunk/KDE/kdevelop/plugins/builders/cmakebuilder/Messages.sh #property svn:mergeinfo
   + 
** trunk/KDE/kdevelop/plugins/builders/makebuilder/Messages.sh #property svn:mergeinfo
   + 
--- trunk/KDE/kdevelop/plugins/builders/qmakebuilder/CMakeLists.txt #889035:889058
@@ -1,7 +1,7 @@
 
 add_definitions( -DKDE_DEFAULT_DEBUG_AREA=9039 )
 include_directories(
-    ${CMAKE_SOURCE_DIR}/buildtools/builders/makebuilder
+    ${CMAKE_SOURCE_DIR}/plugins/builders/makebuilder
     )
 
 
** trunk/KDE/kdevelop/plugins/builders/qmakebuilder/Messages.sh #property svn:mergeinfo
   + 
** trunk/KDE/kdevelop/plugins/languages #property svn:ignore
   + Doxyfile
Makefile
Makefile.in
--- trunk/KDE/kdevelop/plugins/languages/cpp/CMakeLists.txt #889035:889058
@@ -1,8 +1,8 @@
 include(CppBuildConfig.cmake)
 
 include_directories(
-    ${CMAKE_SOURCE_DIR}/languages/cpp/parser
-    ${CMAKE_SOURCE_DIR}/languages/cpp/cppduchain
+    ${CMAKE_SOURCE_DIR}/plugins/languages/cpp/parser
+    ${CMAKE_SOURCE_DIR}/plugins/languages/cpp/cppduchain
 )
 
 add_definitions( -DKDE_DEFAULT_DEBUG_AREA=9007 )
** trunk/KDE/kdevelop/plugins/languages/cpp/Messages.sh #property svn:mergeinfo
   + 
--- trunk/KDE/kdevelop/plugins/languages/cpp/cppduchain/CMakeLists.txt #889035:889058
@@ -7,8 +7,8 @@
 add_subdirectory(tests)
 
 include_directories(
-    ${CMAKE_SOURCE_DIR}/languages/cpp
-    ${CMAKE_BINARY_DIR}/languages/cpp
+    ${CMAKE_SOURCE_DIR}/plugins/languages/cpp
+    ${CMAKE_BINARY_DIR}/plugins/languages/cpp
 )
 
 ########### next target ###############
--- trunk/KDE/kdevelop/plugins/languages/cpp/cppduchain/tests/CMakeLists.txt #889035:889058
@@ -1,7 +1,8 @@
 set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories(
-    ${CMAKE_SOURCE_DIR}/languages/cpp/parser
-    ${CMAKE_BINARY_DIR}/languages/cpp
+    ${CMAKE_SOURCE_DIR}/plugins/languages/cpp
+    ${CMAKE_SOURCE_DIR}/plugins/languages/cpp/parser
+    ${CMAKE_BINARY_DIR}/plugins/languages/cpp
 )
 
 ########### next target ###############
** trunk/KDE/kdevelop/plugins/languages/cpp/debugger/Messages.sh #property svn:mergeinfo
   + 
--- trunk/KDE/kdevelop/plugins/languages/cpp/parser/rpp/tests/CMakeLists.txt #889035:889058
@@ -1,5 +1,5 @@
 set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-include_directories( ${CMAKE_SOURCE_DIR}/languages/cpp/parser ${CMAKE_CURRENT_SOURCE_DIR}/..  )
+include_directories( ${CMAKE_SOURCE_DIR}/plugins/languages/cpp/parser ${CMAKE_CURRENT_SOURCE_DIR}/..  )
 
 
 ########### next target ###############
--- trunk/KDE/kdevelop/plugins/languages/cpp/tests/CMakeLists.txt #889035:889058
@@ -1,9 +1,9 @@
 set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 
 include_directories(
-    ${CMAKE_SOURCE_DIR}/languages/cpp/expressionparser
-    ${CMAKE_SOURCE_DIR}/languages/cpp
-    ${CMAKE_BINARY_DIR}/languages/cpp
+    ${CMAKE_SOURCE_DIR}/plugins/languages/cpp/expressionparser
+    ${CMAKE_SOURCE_DIR}/plugins/languages/cpp
+    ${CMAKE_BINARY_DIR}/plugins/languages/cpp
 )
 
 ########### next target ###############
--- trunk/KDE/kdevelop/plugins/languages/cpp/veritas/CMakeLists.txt #889035:889058
@@ -2,8 +2,8 @@
 add_definitions( -DKDE_DEFAULT_DEBUG_AREA=9003 )
 
 include_directories(
-    ${CMAKE_SOURCE_DIR}/languages/cpp
-    ${CMAKE_BINARY_DIR}/languages/cpp)
+    ${CMAKE_SOURCE_DIR}/plugins/languages/cpp
+    ${CMAKE_BINARY_DIR}/plugins/languages/cpp)
 
 add_subdirectory(tests)
 
--- trunk/KDE/kdevelop/plugins/languages/cpp/veritas/stubconstructor.cpp #889035:889058
@@ -30,7 +30,7 @@
 #include <language/duchain/classfunctiondeclaration.h>
 
 // kdevelop
-#include "languages/cpp/cppduchain/classdeclaration.h"
+#include "../cppduchain/classdeclaration.h"
 
 using Veritas::ClassSkeleton;
 using Veritas::MethodSkeleton;
--- trunk/KDE/kdevelop/plugins/languages/cpp/veritas/stubcontextaction.cpp #889035:889058
@@ -48,7 +48,7 @@
 #include <language/duchain/duchainlock.h>
 
 // kdevelop
-#include "languages/cpp/cppduchain/classdeclaration.h"
+#include "../cppduchain/classdeclaration.h"
 
 using Veritas::ClassSkeleton;
 using Veritas::ClassSerializer;
--- trunk/KDE/kdevelop/plugins/languages/cpp/veritas/tests/classdeclarationfactory.cpp #889035:889058
@@ -25,14 +25,14 @@
 #include <language/duchain/duchainlock.h>
 
 // kdevelop
-#include "languages/cpp/cppduchain/classdeclaration.h"
-#include "languages/cpp/cppduchain/declarationbuilder.h"
-#include "languages/cpp/cppduchain/environmentmanager.h"
-#include "languages/cpp/cppduchain/usebuilder.h"
-#include "languages/cpp/parser/parser.h"
-#include "languages/cpp/parser/parsesession.h"
-#include "languages/cpp/parser/rpp/preprocessor.h"
-#include "languages/cpp/parser/rpp/pp-engine.h"
+#include "../cppduchain/classdeclaration.h"
+#include "../cppduchain/declarationbuilder.h"
+#include "../cppduchain/environmentmanager.h"
+#include "../cppduchain/usebuilder.h"
+#include "../parser/parser.h"
+#include "../parser/parsesession.h"
+#include "../parser/rpp/preprocessor.h"
+#include "../parser/rpp/pp-engine.h"
 
 using Veritas::Test::DeclarationFactory;
 using namespace KDevelop;
--- trunk/KDE/kdevelop/plugins/languages/cpp/veritas/tests/classdeclarationfactory.h #889035:889058
@@ -24,7 +24,7 @@
 
 #include <QList>
 #include "../veritascppexport.h"
-#include "languages/cpp/parser/control.h"
+#include "../parser/control.h"
 
 namespace Cpp { class ClassDeclaration; }
 namespace KDevelop { class TopDUContext; class DUChainWriteLocker; class Declaration;}
--- trunk/KDE/kdevelop/plugins/languages/cpp/veritas/tests/stubcreationtest.cpp #889035:889058
@@ -29,7 +29,7 @@
 
 #include "classdeclarationfactory.h"
 
-#include "languages/cpp/cppduchain/classdeclaration.h"
+#include "../cppduchain/classdeclaration.h"
 #include <language/editor/simplecursor.h>
 
 
--- trunk/KDE/kdevelop/plugins/languages/cpp/veritas/testswitch.cpp #889035:889058
@@ -45,9 +45,9 @@
 #include <language/duchain/persistentsymboltable.h>
 
 // kdevelop includes
-#include "languages/cpp/cppduchain/cppduchain.h"
-#include "languages/cpp/cppduchain/environmentmanager.h"
-#include "languages/cpp/cppduchain/cpppreprocessenvironment.h"
+#include "../cppduchain/cppduchain.h"
+#include "../cppduchain/environmentmanager.h"
+#include "../cppduchain/cpppreprocessenvironment.h"
 
 using Veritas::TestSwitch;
 using namespace KDevelop;
--- trunk/KDE/kdevelop/plugins/languages/cpp/veritas/testswitch.h #889035:889058
@@ -23,7 +23,7 @@
 #define VERITAS_TESTSWITCH_H
 
 #include "veritascppexport.h"
-#include "languages/cpp/cppduchain/environmentmanager.h"
+#include "../cppduchain/environmentmanager.h"
 #include <QtCore/QObject>
 
 class KActionCollection;
--- trunk/KDE/kdevelop/plugins/languages/cpp/veritas/uutconstructor.cpp #889035:889058
@@ -30,8 +30,8 @@
 #include <language/duchain/duchainlock.h>
 #include <language/duchain/types/delayedtype.h>
 
-#include "languages/cpp/cppduchain/expressionparser.h"
-#include "languages/cpp/cppduchain/expressionevaluationresult.h"
+#include "../cppduchain/expressionparser.h"
+#include "../cppduchain/expressionevaluationresult.h"
 
 #include <ktexteditor/smartrange.h>
 
--- trunk/KDE/kdevelop/plugins/languages/cpp/veritas/uutcontextaction.cpp #889035:889058
@@ -49,7 +49,7 @@
 #include <language/interfaces/editorcontext.h>
 
 // kdevelop
-#include "languages/cpp/cppduchain/classdeclaration.h"
+#include "../cppduchain/classdeclaration.h"
 
 using Veritas::ClassSkeleton;
 using Veritas::ClassSerializer;
** trunk/KDE/kdevelop/plugins/managers #property svn:ignore
   + Makefile
Makefile.in
--- trunk/KDE/kdevelop/plugins/managers/cmake/CMakeLists.txt #889035:889058
@@ -2,7 +2,7 @@
 include_directories(
     
     ${CMAKE_CURRENT_SOURCE_DIR}/parser
-    ${CMAKE_SOURCE_DIR}/buildtools/builders/cmakebuilder/
+    ${CMAKE_SOURCE_DIR}/plugins/builders/cmakebuilder/
 )
 add_subdirectory(tests)
 
** trunk/KDE/kdevelop/plugins/managers/cmake/Messages.sh #property svn:mergeinfo
   + 
--- trunk/KDE/kdevelop/plugins/managers/cmake/tests/CMakeLists.txt #889035:889058
@@ -1,7 +1,7 @@
 set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories(
-    ${CMAKE_SOURCE_DIR}/buildtools/managers/cmake
-    ${CMAKE_SOURCE_DIR}/buildtools/managers/cmake/parser
+    ${CMAKE_SOURCE_DIR}/plugins/managers/cmake
+    ${CMAKE_SOURCE_DIR}/plugins/managers/cmake/parser
     )
 
 set( cmakeparsertest_SRCS cmakeparsertest.cpp )
--- trunk/KDE/kdevelop/plugins/managers/custommake/CMakeLists.txt #889035:889058
@@ -3,7 +3,7 @@
 # add_subdirectory(tests)
 
 include_directories(
-    ${CMAKE_SOURCE_DIR}/buildtools/builders/makebuilder
+    ${CMAKE_SOURCE_DIR}/plugins/builders/makebuilder
     )
 
 
** trunk/KDE/kdevelop/plugins/managers/custommake/Messages.sh #property svn:mergeinfo
   + 
--- trunk/KDE/kdevelop/plugins/managers/qmake/CMakeLists.txt #889035:889058
@@ -4,7 +4,7 @@
 
 find_package(KDevelop-PG-Qt QUIET)
 include_directories(
-    ${CMAKE_SOURCE_DIR}/buildtools/builders/qmakebuilder
+    ${CMAKE_SOURCE_DIR}/plugins/builders/qmakebuilder
     ${QMakeManager_SOURCE_DIR}
     ${QMakeManager_BINARY_DIR}
 )
** trunk/KDE/kdevelop/plugins/managers/qmake/Messages.sh #property svn:mergeinfo
   +

More information about the KDevelop-devel mailing list