diff --git a/.gitignore b/.gitignore index fc5ee99442b..cb762fd3e31 100644 --- a/.gitignore +++ b/.gitignore @@ -32,21 +32,12 @@ /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 @@ -54,59 +45,12 @@ /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 diff --git a/Doxyfile b/Doxyfile index 2c495487afb..308fa5118fe 100644 --- a/Doxyfile +++ b/Doxyfile @@ -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 = diff --git a/Makefile.in b/Makefile.in index fff10db2a23..f1d4b7225bb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 diff --git a/addon/doxmlparser/examples/metrics/metrics.pro.in b/addon/doxmlparser/examples/metrics/metrics.pro.in index 6dd344faa73..3b2354d9f2c 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 841a46c3f6c..2bbf326e8a0 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 cfb95be4829..368d4997f0c 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 4a49a566373..7a8c5ee2725 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 deeb8f8dcbf..c84a2acc7b0 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 c860fd1467a..702f5a473ec 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 152c2b77a3e..8cafb9ece62 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 01832df1fa2..0c8d0499f8b 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 4c988c9230b..155498c441f 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) diff --git a/configure b/configure index 9c3d28b15be..f7129995546 100755 --- a/configure +++ b/configure @@ -672,15 +672,32 @@ fi # ----------------------------------------------------------------------------- +if ! test -d "generated_src/doxygen"; then + mkdir -p generated_src/doxygen +fi +if test "$f_wizard" = YES; then + if ! test -d "generated_src/doxywizard"; then + mkdir -p generated_src/doxywizard + fi +fi + # # Make VERSION file # -echo " Creating VERSION file." -# Output should be something like 1.4.5-20051010 -if test "x$doxygen_version_mmn" = "xNO"; then - echo "$doxygen_version_major.$doxygen_version_minor.$doxygen_version_revision" > VERSION -else - echo "$doxygen_version_major.$doxygen_version_minor.$doxygen_version_revision-$doxygen_version_mmn" > VERSION +test -f "VERSION" && chmod u+w VERSION +test -f "generated_src/doxygen/version.cpp" && chmod u+w generated_src/doxygen/version.cpp +echo " Generating generated_src/doxygen/version.cpp and VERSION..." +cd src +$f_python version.py ../generated_src/doxygen +cd .. +if test "$f_wizard" = YES; then + test -f "VERSION" && chmod u+w VERSION + test -f "generated_src/doxywizard/version.cpp" && chmod u+w generated_src/doxywizard/version.cpp + echo " Generating generated_src/doxywizard/version.cpp and VERSION..." + cd src + $f_python version.py ../generated_src/doxywizard + cd .. + fi test -f .makeconfig && rm .makeconfig @@ -828,7 +845,7 @@ EOF # if test $f_search = YES; then # EXTRADEPS="$EXTRADEPS doxysearch" # fi - echo "all: src/version.cpp $EXTRADEPS" >> $DST + echo "all: generated_src/doxygen/version.cpp $EXTRADEPS" >> $DST echo " \$(MAKE) -C qtools" >> $DST echo " \$(MAKE) -C libmd5" >> $DST echo " \$(MAKE) -C src" >> $DST @@ -892,28 +909,33 @@ EOF echo " Created $DST from $SRC..." done -# - generating src/lang_cfg.h +# - generating generated_src/doxygen/doxygen/lang_cfg.h # use consistent method on Linux and Windows -if test -f "src/lang_cfg.h"; then - chmod u+w src/lang_cfg.h # make sure file can be overwritten +if test -f "generated_src/doxygen/lang_cfg.h"; then + chmod u+w generated_src/doxygen/lang_cfg.h # make sure file can be overwritten fi -echo " Generating src/lang_cfg.h..." +echo " Generating generated_src/doxygen/lang_cfg.h..." if test "$f_english" = YES; then - $f_python src/lang_cfg.py ENONLY > src/lang_cfg.h + $f_python src/lang_cfg.py ENONLY > generated_src/doxygen/lang_cfg.h else f_ulangs=`echo $f_langs | tr '[a-z,]' '[A-Z ]'` - $f_python src/lang_cfg.py $f_ulangs > src/lang_cfg.h + $f_python src/lang_cfg.py $f_ulangs > generated_src/doxygen/lang_cfg.h fi -if test -f "src/config.h"; then - chmod u+w src/config.h +if test -f "generated_src/doxygen/settings.h"; then + chmod u+w generated_src/doxygen/settings.h fi -if test -f "src/settings.h"; then - chmod u+w src/settings.h +echo " Generating generated_src/doxygen/settings.h..." +$f_python src/settings.py $f_sqlite3 $f_libclang generated_src/doxygen + +if test "$f_wizard" = YES; then + if test -f "generated_src/doxywizard/settings.h"; then + chmod u+w generated_src/doxywizard/settings.h + fi + echo " Generating generated_src/doxywizard/settings.h..." + $f_python src/settings.py $f_sqlite3 $f_libclang generated_src/doxywizard fi -echo " Generating src/settings.h..." -cd src -$f_python settings.py $f_sqlite3 $f_libclang + cd .. echo " Finished" diff --git a/libmd5/libmd5.pro.in b/libmd5/libmd5.pro.in index 8cf71180537..55161744cb3 100644 --- a/libmd5/libmd5.pro.in +++ b/libmd5/libmd5.pro.in @@ -6,5 +6,5 @@ win32:INCLUDEPATH += . win32-g++:TMAKE_CFLAGS += -D__CYGWIN__ -DALL_STATIC DESTDIR = ../lib TARGET = md5 -OBJECTS_DIR = ../objects +OBJECTS_DIR = ../objects/md5 diff --git a/qtools/qtools.pro.in b/qtools/qtools.pro.in index b760d14a862..f287d34c097 100644 --- a/qtools/qtools.pro.in +++ b/qtools/qtools.pro.in @@ -98,5 +98,5 @@ INCLUDEPATH = . TMAKE_CXXFLAGS += -DQT_LITE_UNICODE win32:TMAKE_CXXFLAGS += -DQT_NODLL win32-g++:TMAKE_CXXFLAGS += -D__CYGWIN__ -DALL_STATIC -OBJECTS_DIR = ../objects +OBJECTS_DIR = ../objects/qtools DESTDIR = ../lib diff --git a/src/Makefile.in b/src/Makefile.in index 7d1d0d95b9d..9d862131db8 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -14,6 +14,8 @@ # input used in their production; they are not affected by this license. # +GENERATED_SRC = ../generated_src/doxygen + all: Makefile.libdoxygen Makefile.libdoxycfg Makefile.doxygen Makefile $(MAKE) -f Makefile.libdoxycfg $@ $(MAKE) -f Makefile.libdoxygen $@ @@ -42,7 +44,7 @@ clean: Makefile.libdoxygen Makefile.libdoxycfg Makefile.doxygen # also clean flex/bison generated files distclean: clean - -$(RM) scanner.cpp code.cpp config.cpp pre.cpp constexp.cpp \ + -cd $(GENERATED_SRC) && $(RM) scanner.cpp code.cpp config.cpp pre.cpp constexp.cpp \ ce_parse.cpp ce_parse.h tag.cpp commentscan.cpp \ declinfo.cpp defargs.cpp commentcnv.cpp doctokenizer.cpp \ pycode.cpp pyscanner.cpp fortrancode.cpp fortranscanner.cpp \ @@ -51,11 +53,11 @@ distclean: clean # clean also the generated files which are in SVN realclean: distclean - -$(RM) index.xsd.h compound.xsd.h layout_default.xml.h \ + -cd $(GENERATED_SRC) && $(RM) index.xsd.h compound.xsd.h layout_default.xml.h \ header.html.h footer.html.h search_functions.php.h search_opensearch.php.h \ search.js.h search.css.h doxygen.css.h navtree.js.h resize.js.h \ doxygen.sty.h jquery_fx.js.h jquery_p1.js.h jquery_p2.js.h \ jquery_p3.js.h jquery_ui.js.h navtree.css.h svgpan.js.h dynsections.js.h \ - doxygen.bst.h bib2xhtml.pl.h configoptions.cpp jquery_pt.js.h extsearch.js.h + doxygen.bst.h bib2xhtml.pl.h ../generated_src/doxygen/configoptions.cpp jquery_pt.js.h extsearch.js.h FORCE: diff --git a/src/doxygen.pro.in b/src/doxygen.pro.in index d9589e7f92f..f6b7763b8bc 100644 --- a/src/doxygen.pro.in +++ b/src/doxygen.pro.in @@ -35,5 +35,5 @@ unix:TARGETDEPS = ../lib/libdoxygen.a ../lib/libdoxycfg.a win32:TARGETDEPS = ..\lib\doxygen.lib ..\lib\doxycfg.lib win32-g++:TARGETDEPS = ../lib/libdoxygen.a ../lib/libdoxycfg.a win32-mingw:TARGETDEPS = ../lib/libdoxygen.a ../lib/libdoxycfg.a -OBJECTS_DIR = ../objects +OBJECTS_DIR = ../objects/doxygen diff --git a/src/lang_cfg.h b/src/lang_cfg.h deleted file mode 100644 index 769696c7dda..00000000000 --- a/src/lang_cfg.h +++ /dev/null @@ -1,42 +0,0 @@ -#define LANG_AM -#define LANG_AR -#define LANG_BR -#define LANG_CA -#define LANG_CN -#define LANG_CZ -#define LANG_DE -#define LANG_DK -#define LANG_EN -#define LANG_EO -#define LANG_ES -#define LANG_FA -#define LANG_FI -#define LANG_FR -#define LANG_GR -#define LANG_HR -#define LANG_HU -#define LANG_ID -#define LANG_IT -#define LANG_JE -#define LANG_JP -#define LANG_KE -#define LANG_KR -#define LANG_LT -#define LANG_LV -#define LANG_MK -#define LANG_NL -#define LANG_NO -#define LANG_PL -#define LANG_PT -#define LANG_RO -#define LANG_RU -#define LANG_SC -#define LANG_SI -#define LANG_SK -#define LANG_SR -#define LANG_SV -#define LANG_TR -#define LANG_TW -#define LANG_UA -#define LANG_VI -#define LANG_ZA diff --git a/src/languages.py b/src/languages.py index 0005e88c521..7ce382a6e37 100755 --- a/src/languages.py +++ b/src/languages.py @@ -25,8 +25,8 @@ config.cpp +#$ GenerateDep("../generated_src/doxygen/config.cpp","config.l"); + $(LEX) -PconfigYY -t config.l >../generated_src/doxygen/config.cpp -configoptions.cpp: config.xml configgen.py - $(PYTHON) configgen.py -cpp config.xml >configoptions.cpp +../generated_src/doxygen/configoptions.cpp: config.xml configgen.py + $(PYTHON) configgen.py -cpp config.xml >../generated_src/doxygen/configoptions.cpp diff --git a/src/libdoxygen.pro.in b/src/libdoxygen.pro.in index b230b2f3943..7a54744c742 100644 --- a/src/libdoxygen.pro.in +++ b/src/libdoxygen.pro.in @@ -17,7 +17,7 @@ TEMPLATE = libdoxygen.t CONFIG = console warn_on staticlib $extraopts HEADERS = arguments.h \ - bib2xhtml.pl.h \ + ../generated_src/doxygen/bib2xhtml.pl.h \ bufstr.h \ cite.h \ clangparser.h \ @@ -27,7 +27,7 @@ HEADERS = arguments.h \ code.h \ commentcnv.h \ commentscan.h \ - compound.xsd.h \ + ../generated_src/doxygen/compound.xsd.h \ condparser.h \ config.h \ context.h \ @@ -47,20 +47,20 @@ HEADERS = arguments.h \ docvisitor.h \ dot.h \ doxygen.h \ - doxygen.bst.h \ - doxygen.css.h \ - doxygen.sty.h \ + ../generated_src/doxygen/doxygen.bst.h \ + ../generated_src/doxygen/doxygen.css.h \ + ../generated_src/doxygen/doxygen.sty.h \ eclipsehelp.h \ entry.h \ example.h \ filedef.h \ filename.h \ - footer.html.h \ + ../generated_src/doxygen/footer.html.h \ formula.h \ ftextstream.h \ ftvhelp.h \ groupdef.h \ - header.html.h \ + ../generated_src/doxygen/header.html.h \ htags.h \ htmlattrib.h \ htmldocvisitor.h \ @@ -68,20 +68,20 @@ HEADERS = arguments.h \ htmlhelp.h \ image.h \ index.h \ - index.xsd.h \ - jquery_p1.js.h \ - jquery_p2.js.h \ - jquery_p3.js.h \ - jquery_ui.js.h \ - jquery_fx.js.h \ - jquery_pt.js.h \ - svgpan.js.h \ - dynsections.js.h \ + ../generated_src/doxygen/index.xsd.h \ + ../generated_src/doxygen/jquery_p1.js.h \ + ../generated_src/doxygen/jquery_p2.js.h \ + ../generated_src/doxygen/jquery_p3.js.h \ + ../generated_src/doxygen/jquery_ui.js.h \ + ../generated_src/doxygen/jquery_fx.js.h \ + ../generated_src/doxygen/jquery_pt.js.h \ + ../generated_src/doxygen/svgpan.js.h \ + ../generated_src/doxygen/dynsections.js.h \ language.h \ latexdocvisitor.h \ latexgen.h \ layout.h \ - layout_default.xml.h \ + ../generated_src/doxygen/layout_default.xml.h \ logos.h \ mandocvisitor.h \ mangen.h \ @@ -96,8 +96,8 @@ HEADERS = arguments.h \ msc.h \ dia.h \ namespacedef.h \ - navtree.css.h \ - navtree.js.h \ + ../generated_src/doxygen/navtree.css.h \ + ../generated_src/doxygen/navtree.js.h \ objcache.h \ outputgen.h \ outputlist.h \ @@ -114,17 +114,17 @@ HEADERS = arguments.h \ qhp.h \ qhpxmlwriter.h \ reflist.h \ - resize.js.h \ + ../generated_src/doxygen/resize.js.h \ rtfdocvisitor.h \ rtfgen.h \ rtfstyle.h \ scanner.h \ searchindex.h \ - search.css.h \ - search.js.h \ - extsearch.js.h \ - search_functions.php.h \ - search_opensearch.php.h \ + ../generated_src/doxygen/search.css.h \ + ../generated_src/doxygen/search.js.h \ + ../generated_src/doxygen/extsearch.js.h \ + ../generated_src/doxygen/search_functions.php.h \ + ../generated_src/doxygen/search_opensearch.php.h \ section.h \ sortdict.h \ store.h \ @@ -146,31 +146,25 @@ HEADERS = arguments.h \ docbookgen.h SOURCES = arguments.cpp \ - constexp.cpp \ - ce_parse.cpp \ + ../generated_src/doxygen/ce_parse.cpp \ + ../generated_src/doxygen/constexp.cpp \ cite.cpp \ clangparser.cpp \ classdef.cpp \ classlist.cpp \ cmdmapper.cpp \ - code.cpp \ - commentcnv.cpp \ - commentscan.cpp \ condparser.cpp \ context.cpp \ cppvalue.cpp \ dbusxmlscanner.cpp \ debug.cpp \ defgen.cpp \ - declinfo.cpp \ - defargs.cpp \ define.cpp \ definition.cpp \ diagram.cpp \ dirdef.cpp \ docparser.cpp \ docsets.cpp \ - doctokenizer.cpp \ dot.cpp \ doxygen.cpp \ eclipsehelp.cpp \ @@ -180,8 +174,6 @@ SOURCES = arguments.cpp \ formula.cpp \ ftextstream.cpp \ ftvhelp.cpp \ - fortrancode.cpp \ - fortranscanner.cpp \ groupdef.cpp \ htags.cpp \ htmldocvisitor.cpp \ @@ -213,46 +205,56 @@ SOURCES = arguments.cpp \ outputlist.cpp \ pagedef.cpp \ perlmodgen.cpp \ - pre.cpp \ - pycode.cpp \ - pyscanner.cpp \ qhp.cpp \ qhpxmlwriter.cpp \ reflist.cpp \ rtfdocvisitor.cpp \ rtfgen.cpp \ rtfstyle.cpp \ - scanner.cpp \ searchindex.cpp \ store.cpp \ tagreader.cpp \ - tclscanner.cpp \ template.cpp \ textdocvisitor.cpp \ tooltip.cpp \ util.cpp \ - version.cpp \ - vhdlcode.cpp \ + ../generated_src/doxygen/vhdlcode.cpp \ vhdldocgen.cpp \ - vhdlparser.cpp \ - vhdlscanner.cpp \ + ../generated_src/doxygen/vhdlparser.cpp \ + ../generated_src/doxygen/vhdlscanner.cpp \ xmldocvisitor.cpp \ xmlgen.cpp \ docbookvisitor.cpp \ - docbookgen.cpp + docbookgen.cpp \ + ../generated_src/doxygen/code.cpp \ + ../generated_src/doxygen/commentcnv.cpp \ + ../generated_src/doxygen/commentscan.cpp \ + ../generated_src/doxygen/declinfo.cpp \ + ../generated_src/doxygen/defargs.cpp \ + ../generated_src/doxygen/doctokenizer.cpp \ + ../generated_src/doxygen/pre.cpp \ + ../generated_src/doxygen/pycode.cpp \ + ../generated_src/doxygen/pyscanner.cpp \ + ../generated_src/doxygen/scanner.cpp \ + ../generated_src/doxygen/tclscanner.cpp \ + ../generated_src/doxygen/fortrancode.cpp \ + ../generated_src/doxygen/fortranscanner.cpp \ + ../generated_src/doxygen/version.cpp win32:TMAKE_CXXFLAGS += -DQT_NODLL win32-msvc:TMAKE_CXXFLAGS += -Zm200 win32-g++:TMAKE_CXXFLAGS += -fno-exceptions linux-g++:TMAKE_CXXFLAGS += -fno-exceptions +INCLUDEPATH += ../generated_src/doxygen +INCLUDEPATH += ../src INCLUDEPATH += ../qtools #INCLUDEPATH += ../libpng INCLUDEPATH += ../libmd5 INCLUDEPATH += %%SQLITE3_INC%% win32:INCLUDEPATH += . #win32-g++:INCLUDEPATH = ../qtools /usr/include/libpng12 ../libmd5 -win32-g++:INCLUDEPATH = ../qtools ../libmd5 +win32-g++:INCLUDEPATH = ../generated_src/doxygen ../src ../qtools ../libmd5 DESTDIR = ../lib TARGET = doxygen -OBJECTS_DIR = ../objects +OBJECTS_DIR = ../objects/doxygen diff --git a/src/libdoxygen.t.in b/src/libdoxygen.t.in index f131f709ada..2e03224aa85 100644 --- a/src/libdoxygen.t.in +++ b/src/libdoxygen.t.in @@ -21,6 +21,7 @@ YACC = %%BISON%% PYTHON = %%PYTHON%% PERL = %%PERL%% INCBUFSIZE = $(PYTHON) increasebuffer.py +GENERATED_SRC = ../generated_src/doxygen #${ sub GenerateDep { @@ -49,170 +50,169 @@ sub GenerateLex { if ($caseOpt) { $text .= "-i "; } - $text .= "-P".$name."YY -t ".$name.".l | \$(INCBUFSIZE) >".$name.".cpp"; + $text .= "-P".$name."YY -t ".$name.".l | \$(INCBUFSIZE) > \$(GENERATED_SRC)/".$name.".cpp"; } #$} #################### -#$ GenerateDep("scanner.cpp","scanner.l"); +#$ GenerateDep("\$(GENERATED_SRC)/scanner.cpp","scanner.l"); #$ GenerateLex("scanner",0); -#$ GenerateDep("code.cpp","code.l"); +#$ GenerateDep("\$(GENERATED_SRC)/code.cpp","code.l"); #$ GenerateLex("code",0); -#$ GenerateDep("pyscanner.cpp","pyscanner.l"); +#$ GenerateDep("\$(GENERATED_SRC)/pyscanner.cpp","pyscanner.l"); #$ GenerateLex("pyscanner",0); -#$ GenerateDep("pycode.cpp","pycode.l"); +#$ GenerateDep("\$(GENERATED_SRC)/pycode.cpp","pycode.l"); #$ GenerateLex("pycode",0); -#$ GenerateDep("fortranscanner.cpp","fortranscanner.l"); +#$ GenerateDep("\$(GENERATED_SRC)/fortranscanner.cpp","fortranscanner.l"); #$ GenerateLex("fortranscanner",1); -#$ GenerateDep("fortrancode.cpp","fortrancode.l"); +#$ GenerateDep("\$(GENERATED_SRC)/fortrancode.cpp","fortrancode.l"); #$ GenerateLex("fortrancode",1); -#$ GenerateDep("vhdlcode.cpp","vhdlcode.l"); +#$ GenerateDep("\$(GENERATED_SRC)/vhdlcode.cpp","vhdlcode.l"); #$ GenerateLex("vhdlcode",1); -#$ GenerateDep("tclscanner.cpp","tclscanner.l"); +#$ GenerateDep("\$(GENERATED_SRC)/tclscanner.cpp","tclscanner.l"); #$ GenerateLex("tclscanner",1); -#$ GenerateDep("pre.cpp","pre.l"); +#$ GenerateDep("\$(GENERATED_SRC)/pre.cpp","pre.l"); #$ GenerateLex("pre",0); -#$ GenerateDep("declinfo.cpp","declinfo.l"); +#$ GenerateDep("\$(GENERATED_SRC)/declinfo.cpp","declinfo.l"); #$ GenerateLex("declinfo",0); -#$ GenerateDep("defargs.cpp","defargs.l"); +#$ GenerateDep("\$(GENERATED_SRC)/defargs.cpp","defargs.l"); #$ GenerateLex("defargs",0); -#$ GenerateDep("doctokenizer.cpp","doctokenizer.l"); +#$ GenerateDep("\$(GENERATED_SRC)/doctokenizer.cpp","doctokenizer.l"); #$ GenerateLex("doctokenizer",0); -#$ GenerateDep("commentcnv.cpp","commentcnv.l"); +#$ GenerateDep("\$(GENERATED_SRC)/commentcnv.cpp","commentcnv.l"); #$ GenerateLex("commentcnv",0); -#$ GenerateDep("commentscan.cpp","commentscan.l"); +#$ GenerateDep("\$(GENERATED_SRC)/commentscan.cpp","commentscan.l"); #$ GenerateLex("commentscan",0); -#$ GenerateDep("constexp.cpp","constexp.l","ce_parse.h"); +#$ GenerateDep("../generated_src/doxygen/constexp.cpp","constexp.l","../generated_src/doxygen/ce_parse.h"); #$ GenerateLex("constexp",0); -#$ GenerateDep("ce_parse.cpp","constexp.y"); - $(YACC) -l -p constexpYY constexp.y -o ce_parse.cpp +#$ GenerateDep("../generated_src/doxygen/ce_parse.cpp","constexp.y"); + $(YACC) -l -p constexpYY constexp.y -o ../generated_src/doxygen/ce_parse.cpp -#$ GenerateDep("ce_parse.h","constexp.y"); - $(YACC) -l -d -p ce_parsexpYY constexp.y -o ce_parse.c - -rm ce_parse.c +#$ GenerateDep("../generated_src/doxygen/ce_parse.h","constexp.y"); + $(YACC) -l -d -p ce_parsexpYY constexp.y -o ../generated_src/doxygen/ce_parse.c + -rm ../generated_src/doxygen/ce_parse.c -#$ GenerateDep("vhdlscanner.cpp","vhdlscanner.l","vhdlparser.h"); +#$ GenerateDep("\$(GENERATED_SRC)/vhdlscanner.cpp","vhdlscanner.l","../generated_src/doxygen/vhdlparser.h"); #$ GenerateLex("vhdlscanner",1); -#$ GenerateDep("vhdlparser.cpp","vhdlparser.y"); - $(YACC) -l -p vhdlscannerYY vhdlparser.y -o vhdlparser.cpp +#$ GenerateDep("../generated_src/doxygen/vhdlparser.cpp","vhdlparser.y"); + $(YACC) -l -p vhdlscannerYY vhdlparser.y -o ../generated_src/doxygen/vhdlparser.cpp -#$ GenerateDep("vhdlparser.h","vhdlparser.y"); - $(YACC) -l -d -p vhdlscannerYY vhdlparser.y -o vhdlparser.c - -rm vhdlparser.c +#$ GenerateDep("../generated_src/doxygen/vhdlparser.h","vhdlparser.y"); + $(YACC) -l -d -p vhdlscannerYY vhdlparser.y -o ../generated_src/doxygen/vhdlparser.c + -rm ../generated_src/doxygen/vhdlparser.c -#$ GenerateDep("layout.cpp","layout_default.xml.h"); - TO_C_CMD=$(PYTHON) to_c_cmd.py < $< > $@ -cite.cpp: doxygen.bst.h bib2xhtml.pl.h +layout.cpp: $(GENERATED_SRC)/layout_default.xml.h -ftvhelp.cpp: navtree.js.h resize.js.h navtree.css.h +cite.cpp: $(GENERATED_SRC)/doxygen.bst.h $(GENERATED_SRC)/bib2xhtml.pl.h -htmlgen.cpp: header.html.h footer.html.h doxygen.css.h search_functions.php.h \ - search_opensearch.php.h search.css.h jquery_p1.js.h jquery_p2.js.h \ - jquery_p3.js.h jquery_ui.js.h jquery_fx.js.h jquery_pt.js.h \ - svgpan.js.h dynsections.js.h extsearch.js.h +ftvhelp.cpp: $(GENERATED_SRC)/navtree.js.h $(GENERATED_SRC)/resize.js.h $(GENERATED_SRC)/navtree.css.h -layout.cpp: layout_default.xml.h +htmlgen.cpp: $(GENERATED_SRC)/header.html.h $(GENERATED_SRC)/footer.html.h $(GENERATED_SRC)/doxygen.css.h $(GENERATED_SRC)/search_functions.php.h \ + $(GENERATED_SRC)/search_opensearch.php.h $(GENERATED_SRC)/search.css.h $(GENERATED_SRC)/jquery_p1.js.h $(GENERATED_SRC)/jquery_p2.js.h \ + $(GENERATED_SRC)/jquery_p3.js.h $(GENERATED_SRC)/jquery_ui.js.h $(GENERATED_SRC)/jquery_fx.js.h $(GENERATED_SRC)/jquery_pt.js.h \ + $(GENERATED_SRC)/svgpan.js.h $(GENERATED_SRC)/dynsections.js.h $(GENERATED_SRC)/extsearch.js.h -xmlgen.cpp: index.xsd.h compound.xsd.h +layout.cpp: $(GENERATED_SRC)/layout_default.xml.h -latexgen.cpp: doxygen.sty.h +xmlgen.cpp: $(GENERATED_SRC)/index.xsd.h $(GENERATED_SRC)/compound.xsd.h -searchindex.cpp: search.js.h +latexgen.cpp: $(GENERATED_SRC)/doxygen.sty.h -index.xsd.h: index.xsd - $(TO_C_CMD) +searchindex.cpp: $(GENERATED_SRC)/search.js.h -compound.xsd.h: compound.xsd +$(GENERATED_SRC)/index.xsd.h: index.xsd $(TO_C_CMD) -layout_default.xml.h: layout_default.xml +$(GENERATED_SRC)/compound.xsd.h: compound.xsd $(TO_C_CMD) -header.html.h: header.html +$(GENERATED_SRC)/layout_default.xml.h: layout_default.xml $(TO_C_CMD) -footer.html.h: footer.html +$(GENERATED_SRC)/header.html.h: header.html $(TO_C_CMD) -search_functions.php.h: search_functions.php +$(GENERATED_SRC)/footer.html.h: footer.html $(TO_C_CMD) -search_opensearch.php.h: search_opensearch.php +$(GENERATED_SRC)/search_functions.php.h: search_functions.php $(TO_C_CMD) -search.js.h: search.js +$(GENERATED_SRC)/search_opensearch.php.h: search_opensearch.php $(TO_C_CMD) -search.css.h: search.css +$(GENERATED_SRC)/search.js.h: search.js $(TO_C_CMD) -extsearch.js.h: extsearch.js +$(GENERATED_SRC)/search.css.h: search.css $(TO_C_CMD) -doxygen.css.h: doxygen.css +$(GENERATED_SRC)/extsearch.js.h: extsearch.js $(TO_C_CMD) -doxygen.sty.h: doxygen.sty +$(GENERATED_SRC)/doxygen.css.h: doxygen.css $(TO_C_CMD) +$(GENERATED_SRC)/doxygen.sty.h: doxygen.sty + $(TO_C_CMD) -navtree.js.h: navtree.js +$(GENERATED_SRC)/navtree.js.h: navtree.js $(TO_C_CMD) -resize.js.h: resize.js +$(GENERATED_SRC)/resize.js.h: resize.js $(TO_C_CMD) -jquery_p1.js.h: jquery_p1.js +$(GENERATED_SRC)/jquery_p1.js.h: jquery_p1.js $(TO_C_CMD) -jquery_p2.js.h: jquery_p2.js +$(GENERATED_SRC)/jquery_p2.js.h: jquery_p2.js $(TO_C_CMD) -jquery_p3.js.h: jquery_p3.js +$(GENERATED_SRC)/jquery_p3.js.h: jquery_p3.js $(TO_C_CMD) -jquery_ui.js.h: jquery_ui.js +$(GENERATED_SRC)/jquery_ui.js.h: jquery_ui.js $(TO_C_CMD) -jquery_fx.js.h: jquery_fx.js +$(GENERATED_SRC)/jquery_fx.js.h: jquery_fx.js $(TO_C_CMD) -jquery_pt.js.h: jquery_pt.js +$(GENERATED_SRC)/jquery_pt.js.h: jquery_pt.js $(TO_C_CMD) -navtree.css.h: navtree.css +$(GENERATED_SRC)/navtree.css.h: navtree.css $(TO_C_CMD) -svgpan.js.h: svgpan.js +$(GENERATED_SRC)/svgpan.js.h: svgpan.js $(TO_C_CMD) -dynsections.js.h: dynsections.js +$(GENERATED_SRC)/dynsections.js.h: dynsections.js $(TO_C_CMD) -doxygen.bst.h: doxygen.bst +$(GENERATED_SRC)/doxygen.bst.h: doxygen.bst $(TO_C_CMD) -bib2xhtml.pl.h: bib2xhtml.pl +$(GENERATED_SRC)/bib2xhtml.pl.h: bib2xhtml.pl $(TO_C_CMD) -version.cpp: ../configure - $(PYTHON) version.py +$(GENERATED_SRC)/version.cpp: ../configure + $(PYTHON) version.py $(GENERATED_SRC) diff --git a/src/settings.py b/src/settings.py index af24e7b05bc..a9dfa13a8bd 100755 --- a/src/settings.py +++ b/src/settings.py @@ -1,11 +1,12 @@ # import sys +import os f_sqlite3 = sys.argv[1] f_libclang = sys.argv[2] -f1 = open('../src/settings.h','w') +f1 = open(os.path.join(sys.argv[3],'settings.h'),'w') f1.write("#ifndef SETTINGS_H\n") f1.write("#define SETTINGS_H\n") f1.write("\n") diff --git a/src/version.py b/src/version.py index c53303dc1b3..003cf950cd8 100755 --- a/src/version.py +++ b/src/version.py @@ -9,6 +9,7 @@ # the collected information is written to: `../VERSION` and `../src/version.cpp` # import sys +import os # # set 'default' values # @@ -46,7 +47,7 @@ # close files # f1 = open('../VERSION','w') -f2 = open('../src/version.cpp','w') +f2 = open(os.path.join(sys.argv[1],'version.cpp'),'w') if (mnt == 'NO'): f1.write(major + '.' + minor + '.' + revision) f2.write('char versionString[]="' + major + '.' + minor + '.' + revision + '";') diff --git a/tmake/lib/win32-g++/generic.t b/tmake/lib/win32-g++/generic.t index 83fc8908065..33494a2f56c 100644 --- a/tmake/lib/win32-g++/generic.t +++ b/tmake/lib/win32-g++/generic.t @@ -145,9 +145,7 @@ $project{"VER_MIN"} =~ s/^\d+\.//; } if ( Config("staticlib") ) { - $project{"TARGET"} = $project{"DESTDIR"} . "lib" . $project{"TARGET"} - } else { - $project{"TARGET"} = $project{"DESTDIR"} . $project{"TARGET"} + $project{"TARGET"} = "lib" . $project{"TARGET"} } #$} #! diff --git a/tmake/lib/win32-mingw/generic.t b/tmake/lib/win32-mingw/generic.t index ba8e7623e66..4988d59630d 100644 --- a/tmake/lib/win32-mingw/generic.t +++ b/tmake/lib/win32-mingw/generic.t @@ -141,9 +141,7 @@ $project{"VER_MIN"} =~ s/^\d+\.//; } if ( Config("staticlib") ) { - $project{"TARGET"} = $project{"DESTDIR"} . "lib" . $project{"TARGET"}; - } else { - $project{"TARGET"} = $project{"DESTDIR"} . $project{"TARGET"}; + $project{"TARGET"} = "lib" . $project{"TARGET"}; } #$} #! diff --git a/winbuild/Config.rules b/winbuild/Config.rules index 3b6baf55101..040fc65608d 100644 --- a/winbuild/Config.rules +++ b/winbuild/Config.rules @@ -7,8 +7,8 @@ + @@ -39,7 +42,7 @@ + @@ -82,22 +88,22 @@ /> + @@ -201,22 +210,22 @@ + @@ -318,7 +330,7 @@ /> + @@ -438,7 +453,7 @@ @@ -981,8 +996,8 @@ @@ -1317,6 +1332,38 @@ /> + + + + + + + + + + + + + + @@ -2200,7 +2247,7 @@ > + + + + + + @@ -2367,6 +2426,10 @@ RelativePath="..\src\filename.h" > + + @@ -2391,6 +2454,10 @@ RelativePath="..\src\groupdef.h" > + + @@ -2424,7 +2491,7 @@ > + + + + + + + + + + + + + + @@ -2516,7 +2611,7 @@ > + + @@ -2596,15 +2695,19 @@ > + + + + @@ -2820,48 +2927,8 @@ > - - - - - - - - - - - - + @@ -30,7 +33,7 @@ + @@ -73,7 +79,7 @@ Name="VCCLCompilerTool" AdditionalOptions="-Zm200 -w34100 -w34189 -Zm200 -w34100 -w34189 -w34100 -w34189" Optimization="4" - AdditionalIncludeDirectories=""$(QT_DIR)\include\QtCore","$(QT_DIR)\include\QtCore","$(QT_DIR)\include\QtGui","$(QT_DIR)\include\QtGui","$(QT_DIR)\include\QtXml","$(QT_DIR)\include\QtXml","$(QT_DIR)\include","..\addon\doxywizard","$(QT_DIR)\include\ActiveQt","moc","..\addon\doxywizard",".",$(QT_DIR)\mkspecs\win32-msvc2008" + AdditionalIncludeDirectories="$(IntDir);"$(QT_DIR)\include\QtCore","$(QT_DIR)\include\QtCore","$(QT_DIR)\include\QtGui","$(QT_DIR)\include\QtGui","$(QT_DIR)\include\QtXml","$(QT_DIR)\include\QtXml","$(QT_DIR)\include","..\addon\doxywizard","$(QT_DIR)\include\ActiveQt","moc","..\addon\doxywizard",".",$(QT_DIR)\mkspecs\win32-msvc2008" PreprocessorDefinitions="_WINDOWS,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,QT_NO_CAST_FROM_ASCII,QT_NO_CAST_TO_ASCII,QT_XML_LIB,QT_GUI_LIB,QT_CORE_LIB,QT_THREAD_SUPPORT" GeneratePreprocessedFile="0" ExceptionHandling="1" @@ -81,9 +87,9 @@ BufferSecurityCheck="false" TreatWChar_tAsBuiltInType="false" RuntimeTypeInfo="true" - AssemblerListingLocation="Debug\" - ObjectFile="Debug\" - ProgramDataBaseFileName=".\Debug\$(TargetName).pdb" + AssemblerListingLocation="Debug\doxywizard\" + ObjectFile="Debug\doxywizard\" + ProgramDataBaseFileName=".\Debug\doxywizard\$(TargetName).pdb" WarningLevel="3" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -108,7 +114,7 @@ AdditionalLibraryDirectories="$(QT_DIR)\lib" IgnoreDefaultLibraryNames="" GenerateDebugInformation="true" - ProgramDatabaseFile=".\Debug\$(TargetName).pdb" + ProgramDatabaseFile=".\Debug\doxywizard\$(TargetName).pdb" SubSystem="2" LargeAddressAware="2" LinkTimeCodeGeneration="0" @@ -140,7 +146,7 @@ + @@ -183,7 +192,7 @@ Name="VCCLCompilerTool" AdditionalOptions="-Zm200 -w34100 -w34189 -Zm200 -w34100 -w34189 -w34100 -w34189" Optimization="2" - AdditionalIncludeDirectories=""$(QT_DIR)\include\QtCore","$(QT_DIR)\include\QtCore","$(QT_DIR)\include\QtGui","$(QT_DIR)\include\QtGui","$(QT_DIR)\include\QtXml","$(QT_DIR)\include\QtXml","$(QT_DIR)\include","..\addon\doxywizard","$(QT_DIR)\include\ActiveQt","moc","..\addon\doxywizard",".",$(QT_DIR)\mkspecs\win32-msvc2008" + AdditionalIncludeDirectories="$(IntDir);"$(QT_DIR)\include\QtCore","$(QT_DIR)\include\QtCore","$(QT_DIR)\include\QtGui","$(QT_DIR)\include\QtGui","$(QT_DIR)\include\QtXml","$(QT_DIR)\include\QtXml","$(QT_DIR)\include","..\addon\doxywizard","$(QT_DIR)\include\ActiveQt","moc","..\addon\doxywizard",".",$(QT_DIR)\mkspecs\win32-msvc2008" PreprocessorDefinitions="QT_NO_DEBUG,NDEBUG,_WINDOWS,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,QT_NO_CAST_FROM_ASCII,QT_NO_CAST_TO_ASCII,QT_NO_DEBUG,QT_XML_LIB,QT_GUI_LIB,QT_CORE_LIB,QT_THREAD_SUPPORT,NDEBUG" GeneratePreprocessedFile="0" ExceptionHandling="1" @@ -191,9 +200,9 @@ BufferSecurityCheck="false" TreatWChar_tAsBuiltInType="false" RuntimeTypeInfo="true" - AssemblerListingLocation="Release\" - ObjectFile="Release\" - ProgramDataBaseFileName=".\Release\$(TargetName).pdb" + AssemblerListingLocation="Release\doxywizard\" + ObjectFile="Release\doxywizard\" + ProgramDataBaseFileName=".\Release\doxywizard\$(TargetName).pdb" WarningLevel="3" SuppressStartupBanner="true" DebugInformationFormat="0" @@ -220,7 +229,7 @@ IgnoreAllDefaultLibraries="false" IgnoreDefaultLibraryNames="" GenerateDebugInformation="false" - ProgramDatabaseFile=".\Release\$(TargetName).pdb" + ProgramDatabaseFile=".\Release\doxywizard\$(TargetName).pdb" SubSystem="2" LargeAddressAware="2" LinkTimeCodeGeneration="0" @@ -283,7 +292,7 @@ > @@ -335,9 +344,9 @@ @@ -361,9 +370,9 @@ @@ -387,9 +396,9 @@ @@ -413,9 +422,9 @@ @@ -439,9 +448,9 @@ @@ -465,9 +474,9 @@ @@ -491,9 +500,9 @@ @@ -515,47 +524,47 @@ UniqueIdentifier="{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}" > @@ -592,6 +601,24 @@ /> + + + + + + + + @@ -663,9 +690,9 @@ diff --git a/winbuild/Gen_head.rules b/winbuild/Gen_head.rules index 5b0b2b70128..9f1e13dbb5c 100644 --- a/winbuild/Gen_head.rules +++ b/winbuild/Gen_head.rules @@ -7,8 +7,8 @@ + + + + + + diff --git a/winbuild/Version.rules b/winbuild/Version.rules index f19d094dd70..43faeb1fba9 100644 --- a/winbuild/Version.rules +++ b/winbuild/Version.rules @@ -7,8 +7,8 @@ @@ -103,7 +103,7 @@ @@ -182,7 +182,7 @@ @@ -100,7 +100,7 @@ @@ -179,7 +179,7 @@ -#endif - diff --git a/winbuild/unistd.py b/winbuild/unistd.py new file mode 100644 index 00000000000..93b93410ef2 --- /dev/null +++ b/winbuild/unistd.py @@ -0,0 +1,16 @@ +# + +import sys +import os + +f1 = open(os.path.join(sys.argv[1],'unistd.h'),'w') + +f1.write("#ifndef UNISTD_H\n") +f1.write("#define UNISTD_H\n") +f1.write("/* this is a dummy file, that is needed for compiling files that are\n") +f1.write(" * generated with flex under Windows 95/NT.\n") +f1.write(" */\n") +f1.write("#if defined(_MSC_VER)\n") +f1.write(" #include \n") +f1.write("#endif\n") +f1.write("#endif\n") diff --git a/winbuild/version.bat b/winbuild/version.bat deleted file mode 100644 index ce3ded6b1b3..00000000000 --- a/winbuild/version.bat +++ /dev/null @@ -1,24 +0,0 @@ -@for /F "tokens=1* delims== " %%i in (..\configure) do @call :oneline "%%i" "%%j" -@if "%mnt%"=="NO" goto :writereleaseversion -@goto :writecvsversion - -:oneline -@if "-%~1"=="-doxygen_version_major" call :aset major %2 -@if "-%~1"=="-doxygen_version_minor" call :aset minor %2 -@if "-%~1"=="-doxygen_version_revision" call :aset revision %2 -@if "-%~1"=="-doxygen_version_mmn" call :aset mnt %2 -@goto :EOF - -:aset -@set %1=%~2 -@goto :EOF - -:writecvsversion -echo %major%.%minor%.%revision%-%mnt%>..\VERSION -echo char versionString[]="%major%.%minor%.%revision%-%mnt%";>..\src\version.cpp -@goto :EOF - -:writereleaseversion -echo %major%.%minor%.%revision%>..\VERSION -echo char versionString[]="%major%.%minor%.%revision%";>..\src\version.cpp -@goto :EOF