summaryrefslogtreecommitdiffstats
path: root/addon
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2014-01-06 14:40:04 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2014-01-21 19:00:35 (GMT)
commit8885016b2a3bbeb6045a3e71d508939e0a7bd773 (patch)
tree5e4d355d1c37d7dca881de7f25b993e7c7227925 /addon
parent5ea2f2a123e473d5964435369fd925d7f103b456 (diff)
downloadDoxygen-8885016b2a3bbeb6045a3e71d508939e0a7bd773.zip
Doxygen-8885016b2a3bbeb6045a3e71d508939e0a7bd773.tar.gz
Doxygen-8885016b2a3bbeb6045a3e71d508939e0a7bd773.tar.bz2
Spitting generated files better from source files
This patch is a patch for the build system so that less (no) generated files are in the source directories and also that the different build (on windows are independent of each others). Also the different sub-projects (e.g. doxygen , doxywizard) don't share any files anymore. - ./.gitignore A number of files are not in the src directory anymore. generated directories are included. rtf and xml directories are there for possible future use. - ./Doxyfile The generated files are not anymore in the src directory so they don't have to be excluded anymore - ./configure Adjustmenst so the generated files are in the different subdirectories - ./Makefile.in - addon/doxmlparser/examples/metrics/metrics.pro.in - addon/doxmlparser/src/doxmlparser.pro.in - addon/doxmlparser/test/xmlparse.pro.in - addon/doxyapp/doxyapp.pro.in - addon/doxysearch/doxyindexer.pro.in - addon/doxysearch/doxysearch.pro.in - addon/doxywizard/Makefile.in - addon/doxywizard/doxywizard.pro.in - libmd5/libmd5.pro.in - qtools/qtools.pro.in - src/Makefile.in - src/doxygen.pro.in - src/libdoxycfg.pro.in - src/libdoxycfg.t.in - src/libdoxygen.pro.in - src/libdoxygen.t.in Adjustment to the new directory structure - addon/doxywizard/expert.cpp include file is generated in the generated_src/doxywizard directory, referenced through -I on compile line - src/lang_cfg.h File is now automatically generated - src/languages.py Correction of used path for new structure - src/settings.py - src/version.py Place for resulting file handled through an argument, so it is possible to have a separate file for each sub-project - tmake/lib/win32-g++/generic.t - tmake/lib/win32-mingw/generic.t The destination path was added twice, in case of a depth of more than 1 level (doxmlparser) this lead to problems - winbuild/Config.rules - winbuild/Gen_head.rules - winbuild/Languages.rules - winbuild/Lex.rules - winbuild/Settings.rules - winbuild/Version.rules correcting some path of generated files - winbuild/Doxygen.sln Build order dependency could be dropped as the version.cpp file is now a generated file for doxygen and doxywizard - winbuild/Doxygen.vcproj - winbuild/Doxywizard.vcproj Corrected paths to the new structure. Added unistd as an external generated file - winbuild/unistd.h File is now generated - winbuild/Unistd.rules - winbuild/unistd.py Generated unistd for doxygen and doxywizard in a consistent way. - winbuild/doxyindexer.vcproj - winbuild/doxysearch.vcproj - winbuild/qtools.vcproj Corrected paths to the new structure. - winbuild/runbison.bat - winbuild/version.bat Not used anymore everything handled through rules.
Diffstat (limited to 'addon')
-rw-r--r--addon/doxmlparser/examples/metrics/metrics.pro.in16
-rw-r--r--addon/doxmlparser/src/doxmlparser.pro.in4
-rw-r--r--addon/doxmlparser/test/xmlparse.pro.in14
-rw-r--r--addon/doxyapp/doxyapp.pro.in2
-rw-r--r--addon/doxysearch/doxyindexer.pro.in2
-rw-r--r--addon/doxysearch/doxysearch.pro.in2
-rw-r--r--addon/doxywizard/Makefile.in4
-rw-r--r--addon/doxywizard/doxywizard.pro.in20
-rw-r--r--addon/doxywizard/expert.cpp2
9 files changed, 33 insertions, 33 deletions
diff --git a/addon/doxmlparser/examples/metrics/metrics.pro.in b/addon/doxmlparser/examples/metrics/metrics.pro.in
index 6dd344f..3b2354d 100644
--- a/addon/doxmlparser/examples/metrics/metrics.pro.in
+++ b/addon/doxmlparser/examples/metrics/metrics.pro.in
@@ -2,19 +2,19 @@ TEMPLATE = app.t
CONFIG = console warn_on $extraopts
HEADERS =
SOURCES = main.cpp
-unix:LIBS += -L../../../../lib -L../../lib -ldoxmlparser -lqtools
+unix:LIBS += -L../../../../lib -ldoxmlparser -lqtools
win32:INCLUDEPATH += .
-win32-mingw:LIBS += -L../../../../lib -L../../lib -ldoxmlparser -lqtools
+win32-mingw:LIBS += -L../../../../lib -ldoxmlparser -lqtools
win32-msvc:LIBS += doxmlparser.lib qtools.lib shell32.lib
-win32-msvc:TMAKE_LFLAGS += /LIBPATH:..\..\..\..\lib;..\..\lib
+win32-msvc:TMAKE_LFLAGS += /LIBPATH:..\..\..\..\lib;
win32-borland:LIBS += doxmlparser.lib qtools.lib shell32.lib
-win32-borland:TMAKE_LFLAGS += -L..\..\..\..\lib -L..\..\lib
+win32-borland:TMAKE_LFLAGS += -L..\..\..\..\lib
win32:TMAKE_CXXFLAGS += -DQT_NODLL
-DESTDIR =
-OBJECTS_DIR = obj
+DESTDIR = ../../../../bin
+OBJECTS_DIR = ../../../../objects/doxmlparer/metrics
TARGET = metrics
DEPENDPATH = ../../include
INCLUDEPATH += ../../../../qtools ../../include
-unix:TARGETDEPS = ../../lib/libdoxmlparser.a
-win32:TARGETDEPS = ..\..\lib\doxmlparser.lib
+unix:TARGETDEPS = ../../../../lib/libdoxmlparser.a
+win32:TARGETDEPS = ..\..\..\..\lib\doxmlparser.lib
diff --git a/addon/doxmlparser/src/doxmlparser.pro.in b/addon/doxmlparser/src/doxmlparser.pro.in
index 841a46c..2bbf326 100644
--- a/addon/doxmlparser/src/doxmlparser.pro.in
+++ b/addon/doxmlparser/src/doxmlparser.pro.in
@@ -20,8 +20,8 @@ win32-msvc:TMAKE_LFLAGS += /LIBPATH:....\\..\lib
win32-borland:LIBS += qtools.lib doxycfg.lib shell32.lib
win32-borland:TMAKE_LFLAGS += -L..\..\..\lib
win32:TMAKE_CXXFLAGS += -DQT_NODLL
-DESTDIR = ../lib
-OBJECTS_DIR = ../objects
+DESTDIR = ../../../lib
+OBJECTS_DIR = ../../../objects/doxmlparser
TARGET = doxmlparser
INCLUDEPATH += ../../../qtools ../include
diff --git a/addon/doxmlparser/test/xmlparse.pro.in b/addon/doxmlparser/test/xmlparse.pro.in
index cfb95be..368d499 100644
--- a/addon/doxmlparser/test/xmlparse.pro.in
+++ b/addon/doxmlparser/test/xmlparse.pro.in
@@ -2,19 +2,19 @@ TEMPLATE = app.t
CONFIG = console warn_on $extraopts
HEADERS =
SOURCES = main.cpp
-unix:LIBS += -L../../../lib -L../lib -ldoxmlparser -lqtools
+unix:LIBS += -L../../../lib -ldoxmlparser -lqtools
win32:INCLUDEPATH += .
-win32-mingw:LIBS += -L../../../lib -L../lib -ldoxmlparser -lqtools
+win32-mingw:LIBS += -L../../../lib -ldoxmlparser -lqtools
win32-msvc:LIBS += doxmlparser.lib qtools.lib shell32.lib
win32-msvc:TMAKE_LFLAGS += /LIBPATH:..\..\..\lib;..\lib
win32-borland:LIBS += doxmlparser.lib qtools.lib shell32.lib
-win32-borland:TMAKE_LFLAGS += -L..\..\..\lib -L..\lib
+win32-borland:TMAKE_LFLAGS += -L..\..\..\lib
win32:TMAKE_CXXFLAGS += -DQT_NODLL
-DESTDIR =
-OBJECTS_DIR = ../objects
+DESTDIR = ../../../bin
+OBJECTS_DIR = ../../../objects/doxmlparser/test
TARGET = xmlparse
INCLUDEPATH += ../../../qtools ../include
DEPENDPATH += ../include
-unix:TARGETDEPS = ../lib/libdoxmlparser.a
-win32:TARGETDEPS = ..\lib\doxmlparser.lib
+unix:TARGETDEPS = ../../../lib/libdoxmlparser.a
+win32:TARGETDEPS = ..\..\..\lib\doxmlparser.lib
diff --git a/addon/doxyapp/doxyapp.pro.in b/addon/doxyapp/doxyapp.pro.in
index 4a49a56..7a8c5ee 100644
--- a/addon/doxyapp/doxyapp.pro.in
+++ b/addon/doxyapp/doxyapp.pro.in
@@ -4,7 +4,7 @@ HEADERS =
SOURCES = doxyapp.cpp
LIBS += -L../../lib -ldoxygen -lqtools -lmd5 -ldoxycfg -lpthread -liconv
DESTDIR =
-OBJECTS_DIR = ../../objects
+OBJECTS_DIR = ../../objects/doxyapp
TARGET = ../../bin/doxyapp
INCLUDEPATH += ../../qtools ../../src
DEPENDPATH += ../../src
diff --git a/addon/doxysearch/doxyindexer.pro.in b/addon/doxysearch/doxyindexer.pro.in
index deeb8f8..c84a2ac 100644
--- a/addon/doxysearch/doxyindexer.pro.in
+++ b/addon/doxysearch/doxyindexer.pro.in
@@ -4,7 +4,7 @@ HEADERS =
SOURCES = doxyindexer.cpp
LIBS += -L../../lib -lxapian -lqtools
DESTDIR =
-OBJECTS_DIR = ../../objects
+OBJECTS_DIR = ../../objects/doxyindexer
TARGET = ../../bin/doxyindexer
INCLUDEPATH += ../../qtools
DEPENDPATH +=
diff --git a/addon/doxysearch/doxysearch.pro.in b/addon/doxysearch/doxysearch.pro.in
index c860fd1..702f5a4 100644
--- a/addon/doxysearch/doxysearch.pro.in
+++ b/addon/doxysearch/doxysearch.pro.in
@@ -4,7 +4,7 @@ HEADERS =
SOURCES = doxysearch.cpp
LIBS += -lxapian
DESTDIR =
-OBJECTS_DIR = ../../objects
+OBJECTS_DIR = ../../objects/doxysearch
TARGET = ../../bin/doxysearch.cgi
INCLUDEPATH +=
DEPENDPATH +=
diff --git a/addon/doxywizard/Makefile.in b/addon/doxywizard/Makefile.in
index 152c2b7..8cafb9e 100644
--- a/addon/doxywizard/Makefile.in
+++ b/addon/doxywizard/Makefile.in
@@ -30,8 +30,8 @@ distclean: Makefile.doxywizard
$(RM) Makefile.doxywizard
realclean: Makefile.doxywizard
- $(RM) configdoc.cpp
- $(RM) config_doxyw.cpp
+ $(RM) ../../generated_src/doxywizard/configdoc.cpp
+ $(RM) ../../generated_src/doxywizard/config_doxyw.cpp
$(MAKE) distclean
install:
diff --git a/addon/doxywizard/doxywizard.pro.in b/addon/doxywizard/doxywizard.pro.in
index 01832df..0c8d049 100644
--- a/addon/doxywizard/doxywizard.pro.in
+++ b/addon/doxywizard/doxywizard.pro.in
@@ -6,12 +6,12 @@ TEMPLATE = app
DESTDIR = ../../bin
TARGET =
DEPENDPATH += .
-INCLUDEPATH += .
+INCLUDEPATH += . ../../generated_src/doxywizard
QT += xml
CONFIG += $extraopts
-OBJECTS_DIR = obj
-MOC_DIR = moc
-RCC_DIR = rcc
+OBJECTS_DIR = ../../objects/doxywizard
+MOC_DIR = ../../moc/doxywizard
+RCC_DIR = ../../rcc/doxywizard
DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
macx-g++ {
@@ -27,13 +27,13 @@ RESOURCES += doxywizard.qrc
INCBUFSIZE=$(PYTHON) ../../src/increasebuffer.py
win32:RC_FILE += doxywizard.rc
-config.target = config_doxyw.cpp
-config.commands = $(LEX) -P$*YY -t $*.l | $(INCBUFSIZE) >$*.cpp
-config.depends = config_doxyw.l ../../src/increasebuffer.py
-configdoc.target = configdoc.cpp
-configdoc.commands = $(PYTHON) ../../src/configgen.py -wiz ../../src/config.xml > configdoc.cpp
+config.target = ../../generated_src/doxywizard/config_doxyw.cpp
+config.commands = $(LEX) -Pconfig_doxywYY -t ../../addon/doxywizard/config_doxyw.l | $(INCBUFSIZE) >../../generated_src/doxywizard/$*.cpp
+config.depends = ../../addon/doxywizard/config_doxyw.l ../../src/increasebuffer.py
+configdoc.target = ../../generated_src/doxywizard/configdoc.cpp
+configdoc.commands = $(PYTHON) ../../src/configgen.py -wiz ../../src/config.xml > ../../generated_src/doxywizard/configdoc.cpp
configdoc.depends = ../../src/config.xml ../../src/configgen.py
-version.target = ../../src/version.cpp
+version.target = ../../generated_src/doxywizard/version.cpp
version.commands = cd ../../src;$(PYTHON) version.py
version.depends = ../../configure
QMAKE_EXTRA_TARGETS += configdoc config version
diff --git a/addon/doxywizard/expert.cpp b/addon/doxywizard/expert.cpp
index 4c988c9..155498c 100644
--- a/addon/doxywizard/expert.cpp
+++ b/addon/doxywizard/expert.cpp
@@ -9,7 +9,7 @@
#include "config.h"
#include "version.h"
#include "configdoc.h"
-#include "../../src/settings.h"
+#include "settings.h"
#define SA(x) QString::fromAscii(x)