Permalink
Browse files

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.
  • Loading branch information...
albert-github authored and Dimitri van Heesch committed Jan 6, 2014
1 parent 5ea2f2a commit 8885016b2a3bbeb6045a3e71d508939e0a7bd773
@@ -32,81 +32,25 @@
/addon/doxyapp/Makefile.doxyapp
/addon/doxywizard/Makefile
/addon/doxywizard/Makefile.doxywizard
/addon/doxywizard/config_doxyw.cpp
/addon/doxywizard/configdoc.cpp
/addon/doxywizard/moc
/addon/doxywizard/obj
/addon/doxywizard/rcc
/addon/doxmlparser/objects
/addon/doxmlparser/lib
/addon/doxmlparser/test/Makefile.xmlparse
/addon/doxmlparser/test/xmlparse.exe
/addon/doxmlparser/examples/metrics/obj
/addon/doxmlparser/examples/metrics/metrics.exe
/winbuild/config_lex.cpp
/winbuild/moc
/winbuild/obj
/winbuild/rcc
*.idb
*.pdb
/examples/Makefile
/Makefile
/bin
/lib
/generated_src
/objects
/src/ce_lex.cpp
/src/ce_parse.cpp
/src/ce_parse.h
/src/code.cpp
/src/commentcnv.cpp
/src/commentscan.cpp
/src/config.cpp
/src/declinfo.cpp
/src/defargs.cpp
/src/doctokenizer.cpp
/src/fortrancode.cpp
/src/fortranscanner.cpp
/src/pre.cpp
/src/pycode.cpp
/src/pyscanner.cpp
/src/scanner.cpp
/src/tclscanner.cpp
/src/version.cpp
/src/vhdlcode.cpp
/src/vhdlparser.cpp
/src/vhdlparser.h
/src/vhdlscanner.cpp
/src/configoptions.cpp
/src/Makefile
/src/bib2xhtml.pl.h
/src/compound.xsd.h
/src/constexp.cpp
/src/doxygen.bst.h
/src/doxygen.css.h
/src/doxygen.sty.h
/src/dynsections.js.h
/src/extsearch.js.h
/src/footer.html.h
/src/header.html.h
/src/index.xsd.h
/src/jquery_fx.js.h
/src/jquery_p1.js.h
/src/jquery_p2.js.h
/src/jquery_p3.js.h
/src/jquery_pt.js.h
/src/jquery_ui.js.h
/src/layout_default.xml.h
/src/navtree.css.h
/src/navtree.js.h
/src/resize.js.h
/src/search.css.h
/src/search.js.h
/src/search_functions.php.h
/src/search_opensearch.php.h
/src/svgpan.js.h
/src/settings.h
/moc
/rcc
/src/Makefile
/doc/Makefile
/doc/translator_report.txt
@@ -118,3 +62,5 @@
/examples/*/html
/html
/latex
/rtf
/xml
@@ -102,55 +102,8 @@ FILE_PATTERNS = *.h \
*.cpp \
*.md
RECURSIVE = NO
EXCLUDE = src/code.cpp \
src/ce_lex.cpp \
src/ce_parse.cpp \
src/declinfo.cpp \
src/defargs.cpp \
src/doxytag.cpp \
src/pre.cpp \
src/scanner.cpp \
src/tag.cpp \
src/doctokenizer.cpp \
src/logos.cpp \
src/suffixtree.cpp \
src/suffixtree.h \
src/commentcnv.cpp \
src/commentscan.cpp \
src/pycode.cpp \
src/config.cpp \
src/pyscanner.cpp \
src/fortranscanner.cpp \
src/fortrancode.cpp \
src/vhdlscanner.cpp \
src/vhdlparser.cpp \
src/vhdlcode.cpp \
src/tclscanner.cpp \
src/lodepng.cpp \
src/doxygen.css.h \
src/doxygen.js.h \
src/doxygen.php.h \
src/compound.xsd.h \
src/layout_default.xml.h \
src/bib2xhtml.pl.h \
src/doxygen.bst.h \
src/header.html.h \
src/index.xsd.h \
src/jquery.js.h \
src/jquery_fx.js.h \
src/jquery_ui.js.h \
src/navtree.css.h \
src/navtree.hs.h \
src/search.css.h \
src/search_functions.php.h \
src/search_opensearch.php.h \
src/search.js.h \
src/navtree.js.h \
src/resize.js.h \
src/svgpan.js.h \
src/dynsections.js.h \
src/extsearch.js.h \
src/footer.html.h
EXCLUE = src/logos.cpp \
src/lodepng.cpp
EXCLUDE_SYMLINKS = NO
EXCLUDE_SYMBOLS =
EXAMPLE_PATH =
@@ -1,6 +1,3 @@
#all: src/version.cpp doxywizard
# cd qtools ; $(MAKE)
# cd src ; $(MAKE)
DESTDIR =
@@ -31,7 +28,7 @@ clean: FORCE
-cd addon/doxmlparser/test ; $(MAKE) clean
-cd addon/doxmlparser/examples/metrics ; $(MAKE) clean
-rm -f bin/doxy*
-rm -f objects/*.o
-rm -f objects/*/*.o
distclean: clean
-cd src ; $(MAKE) distclean
@@ -46,13 +43,13 @@ distclean: clean
-rm -f bin/doxy*
-rm -f html
-rm -f latex
-rm -f objects/*.o
-rm -f objects/*/*.o
-rm -f src/Makefile.doxygen src/Makefile.libdoxygen
-rm -f src/Makefile.libdoxycfg src/libdoxycfg.t src/libdoxygen.t
-rm -f libmd5/Makefile.libmd5
-rm -f .makeconfig .tmakeconfig
-rm -f src/doxygen.pro src/libdoxygen.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro
-rm -f src/version.cpp
-rm -f generated_src/doxygen/version.cpp
-rm -f addon/doxywizard/doxywizard.pro
-rm -f VERSION
-rm -f packages/rpm/doxygen.spec
@@ -122,12 +119,6 @@ dist: clean
tar zcvf $(DISTDIR).src.tar.gz $(DISTDIR)
rm -rf $(DISTDIR)
src/version.cpp: Makefile
echo "char versionString[]=\"$(VERSION)\";" > src/version.cpp
addon/doxywizard/version.cpp: Makefile
echo "char versionString[]=\"$(VERSION)\";" > addon/doxywizard/version.cpp
DISTDIR = doxygen-`echo $(VERSION) | tr - _`
rpm: dist
gzip -df $(DISTDIR).src.tar.gz
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 +=
@@ -4,7 +4,7 @@ HEADERS =
SOURCES = doxysearch.cpp
LIBS += -lxapian
DESTDIR =
OBJECTS_DIR = ../../objects
OBJECTS_DIR = ../../objects/doxysearch
TARGET = ../../bin/doxysearch.cgi
INCLUDEPATH +=
DEPENDPATH +=
@@ -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:
@@ -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
@@ -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)
Oops, something went wrong.

0 comments on commit 8885016

Please sign in to comment.