From 00415514455991a9ff44b926c50adda994128924 Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Sun, 17 Dec 2000 15:15:12 +0000 Subject: Release-1.2.3-20001217 --- INSTALL | 4 +- Makefile.in | 5 +- Makefile.win.in | 45 -- Makefile.win_make.in | 30 ++ Makefile.win_nmake.in | 45 ++ README | 4 +- VERSION | 2 +- addon/configgen/config_templ.l | 9 + doc/Makefile.win.in | 30 -- doc/Makefile.win_make.in | 30 ++ doc/Makefile.win_nmake.in | 30 ++ doc/doxygen_manual.tex | 1 + doc/install.doc | 27 +- make.bat | 52 ++- packages/rpm/doxygen.spec | 2 +- src/classdef.cpp | 42 +- src/classlist.cpp | 5 + src/config.l | 11 +- src/definition.h | 2 +- src/diagram.cpp | 11 +- src/doc.l | 2 +- src/dot.cpp | 80 ++-- src/doxygen.cpp | 267 ++++++++---- src/doxygen.pro.in | 27 +- src/doxygen.t | 3 - src/doxytag.l | 59 ++- src/doxytag.pro.in | 19 +- src/entry.cpp | 5 + src/entry.h | 8 + src/filedef.cpp | 38 +- src/filedef.h | 7 +- src/formula.cpp | 14 +- src/ftvhelp.cpp | 39 +- src/groupdef.cpp | 60 ++- src/htmlgen.cpp | 1 + src/htmlgen.h | 2 +- src/index.cpp | 33 +- src/latexgen.cpp | 33 +- src/latexgen.h | 2 +- src/mangen.h | 2 +- src/memberdef.cpp | 53 ++- src/memberdef.h | 3 + src/membergroup.h | 2 - src/memberlist.cpp | 20 +- src/namespacedef.cpp | 14 +- src/outputgen.h | 2 +- src/outputlist.h | 34 +- src/page.h | 10 + src/rtfgen.cpp | 28 +- src/rtfgen.h | 2 +- src/scanner.l | 168 ++++---- src/sortdict.h | 40 +- src/tag.h | 23 - src/tag.l | 291 ------------- src/tagreader.cpp | 902 +++++++++++++++++++++++++++++++++++++++ src/tagreader.h | 10 + src/translator_de.h | 2 +- src/util.cpp | 85 +++- src/util.h | 3 +- src/xml.cpp | 17 +- src/xml.h | 1 + tmake/lib/win32-mingw/app.t | 6 + tmake/lib/win32-mingw/generic.t | 241 +++++++++++ tmake/lib/win32-mingw/lib.t | 6 + tmake/lib/win32-mingw/subdirs.t | 2 + tmake/lib/win32-mingw/tmake.conf | 56 +++ wintools/make.pl | 11 +- 67 files changed, 2273 insertions(+), 847 deletions(-) delete mode 100644 Makefile.win.in create mode 100644 Makefile.win_make.in create mode 100644 Makefile.win_nmake.in delete mode 100644 doc/Makefile.win.in create mode 100644 doc/Makefile.win_make.in create mode 100644 doc/Makefile.win_nmake.in delete mode 100644 src/tag.h delete mode 100644 src/tag.l create mode 100644 src/tagreader.cpp create mode 100644 src/tagreader.h create mode 100755 tmake/lib/win32-mingw/app.t create mode 100755 tmake/lib/win32-mingw/generic.t create mode 100755 tmake/lib/win32-mingw/lib.t create mode 100755 tmake/lib/win32-mingw/subdirs.t create mode 100755 tmake/lib/win32-mingw/tmake.conf diff --git a/INSTALL b/INSTALL index 56ae336..8041a58 100644 --- a/INSTALL +++ b/INSTALL @@ -1,6 +1,6 @@ -DOXYGEN Version 1.2.3-20001203 +DOXYGEN Version 1.2.3-20001217 Please read the installation section of the manual for instructions. -------- -Dimitri van Heesch (03 December 2000) +Dimitri van Heesch (17 December 2000) diff --git a/Makefile.in b/Makefile.in index d6b6096..886fcd4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -69,8 +69,9 @@ pdf: docs archive: clean tar zcvf dx`date +%y%m%d`.tgz addon tmake doc wintools examples bin objects \ - qtools src configure configure.bin Makefile.in Makefile.win.in INSTALL \ - make.bat LANGUAGE.HOWTO LICENSE PLATFORMS VERSION packages + qtools src configure configure.bin Makefile.in Makefile.win_nmake.in \ + Makefile.win_make.in INSTALL make.bat LANGUAGE.HOWTO LICENSE PLATFORMS \ + VERSION packages src/version.cpp: Makefile echo "char versionString[]=\"$(VERSION)\";" > src/version.cpp diff --git a/Makefile.win.in b/Makefile.win.in deleted file mode 100644 index 4ca50ec..0000000 --- a/Makefile.win.in +++ /dev/null @@ -1,45 +0,0 @@ -all: src\version.cpp - set TMAKEPATH=$(TMAKEPATH) - cd qtools - $(MAKE) - cd .. - cd src - $(MAKE) - -clean: FORCE - cd examples - $(MAKE) clean - cd .. - cd doc - $(MAKE) clean - cd .. - cd src - $(MAKE) clean - cd .. - -del bin\doxy*.* - -del objects\*.o - -distclean: clean - -del src\Makefile.doxygen \ - src\Makefile.doxytag \ - src\Makefile.doxysearch - -del Makefile src\Makefile examples\Makefile doc\Makefile - -del src\doxygen.pro src\doxytag.pro src\doxysearch.pro - -del src\version.cpp - -docs: FORCE - cd examples - $(MAKE) - cd .. - cd doc - $(MAKE) - cd .. - -ps: docs - cd latex - $(MAKE) - -src\version.cpp: Makefile - echo char versionString[]="$(VERSION)"; > src\version.cpp - -FORCE: diff --git a/Makefile.win_make.in b/Makefile.win_make.in new file mode 100644 index 0000000..a578819 --- /dev/null +++ b/Makefile.win_make.in @@ -0,0 +1,30 @@ +all: src\version.cpp + set TMAKEPATH=$(TMAKEPATH) & cd qtools & $(MAKE) + set TMAKEPATH=$(TMAKEPATH) & cd src & $(MAKE) + +clean: + cd examples & $(MAKE) clean + cd doc & $(MAKE) clean + cd src & $(MAKE) clean + -del bin\doxy*.* + -del objects\*.o + +distclean: clean + -del src\Makefile.doxygen \ + src\Makefile.doxytag \ + src\Makefile.doxysearch + -del Makefile src\Makefile examples\Makefile doc\Makefile + -del src\doxygen.pro src\doxytag.pro src\doxysearch.pro + -del src\version.cpp + +docs: + set TMAKEPATH=$(TMAKEPATH) & cd examples & $(MAKE) + set TMAKEPATH=$(TMAKEPATH) & cd doc & $(MAKE) + +ps: docs + cd latex & $(MAKE) + +src\version.cpp: Makefile + echo char versionString[]="$(VERSION)"; > src\version.cpp + +FORCE: diff --git a/Makefile.win_nmake.in b/Makefile.win_nmake.in new file mode 100644 index 0000000..4ca50ec --- /dev/null +++ b/Makefile.win_nmake.in @@ -0,0 +1,45 @@ +all: src\version.cpp + set TMAKEPATH=$(TMAKEPATH) + cd qtools + $(MAKE) + cd .. + cd src + $(MAKE) + +clean: FORCE + cd examples + $(MAKE) clean + cd .. + cd doc + $(MAKE) clean + cd .. + cd src + $(MAKE) clean + cd .. + -del bin\doxy*.* + -del objects\*.o + +distclean: clean + -del src\Makefile.doxygen \ + src\Makefile.doxytag \ + src\Makefile.doxysearch + -del Makefile src\Makefile examples\Makefile doc\Makefile + -del src\doxygen.pro src\doxytag.pro src\doxysearch.pro + -del src\version.cpp + +docs: FORCE + cd examples + $(MAKE) + cd .. + cd doc + $(MAKE) + cd .. + +ps: docs + cd latex + $(MAKE) + +src\version.cpp: Makefile + echo char versionString[]="$(VERSION)"; > src\version.cpp + +FORCE: diff --git a/README b/README index 7d5098d..1e88e89 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -DOXYGEN Version 1.2.3-20001203 +DOXYGEN Version 1.2.3-20001217 Please read INSTALL for compilation instructions. @@ -7,4 +7,4 @@ The latest version of doxygen can be obtained at Enjoy, -Dimitri van Heesch (03 December 2000) +Dimitri van Heesch (17 December 2000) diff --git a/VERSION b/VERSION index d2f09f2..a55b02d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.3-20001203 +1.2.3-20001217 diff --git a/addon/configgen/config_templ.l b/addon/configgen/config_templ.l index 6cccca9..f680911 100644 --- a/addon/configgen/config_templ.l +++ b/addon/configgen/config_templ.l @@ -891,6 +891,15 @@ void checkConfig() if (!dp.exists() || !dp.isFile()) { err("Warning: the dot tool could not be found at %s\n",Config::dotPath.data()); + Config::dotPath=""; + } + else + { + Config::dotPath=dp.dirPath(TRUE)+"/"; +#if defined(_WIN32) // convert slashes + uint i=0,l=Config::dotPath.length(); + for (i=0;i..\latex\doxygen_manual.tex - @sed -e "s/\$$VERSION/$(VERSION)/g" doxygen.sty >..\latex\doxygen.sty - @copy doxygen_logo.eps ..\latex - -clean: - del /s /q ..\html ..\latex - -FORCE: diff --git a/doc/Makefile.win_make.in b/doc/Makefile.win_make.in new file mode 100644 index 0000000..8d8c0c6 --- /dev/null +++ b/doc/Makefile.win_make.in @@ -0,0 +1,30 @@ +# +# +# +# Copyright (C) 1997-2000 by Dimitri van Heesch. +# +# Permission to use, copy, modify, and distribute this software and its +# documentation under the terms of the GNU General Public License is hereby +# granted. No representations are made about the suitability of this software +# for any purpose. It is provided "as is" without express or implied warranty. +# See the GNU General Public License for more details. +# +# Documents produced by Doxygen are derivative works derived from the +# input used in their production; they are not affected by this license. + +all: + @xcopy /s /q /i ..\examples ..\html\examples + set DOXYGEN_DOCDIR=. & \ + set VERSION=$(VERSION) & \ + $(DOXYGEN)\bin\doxygen + @del ..\latex\refman.tex + @copy doxygen_logo*.gif ..\html + @copy Makefile.latex ..\latex\Makefile + @sed -e "s/\$$VERSION/$(VERSION)/g" doxygen_manual.tex >..\latex\doxygen_manual.tex + @sed -e "s/\$$VERSION/$(VERSION)/g" doxygen.sty >..\latex\doxygen.sty + @copy doxygen_logo.eps ..\latex + +clean: + del /s /q ..\html ..\latex + +FORCE: diff --git a/doc/Makefile.win_nmake.in b/doc/Makefile.win_nmake.in new file mode 100644 index 0000000..0e7624d --- /dev/null +++ b/doc/Makefile.win_nmake.in @@ -0,0 +1,30 @@ +# +# +# +# Copyright (C) 1997-2000 by Dimitri van Heesch. +# +# Permission to use, copy, modify, and distribute this software and its +# documentation under the terms of the GNU General Public License is hereby +# granted. No representations are made about the suitability of this software +# for any purpose. It is provided "as is" without express or implied warranty. +# See the GNU General Public License for more details. +# +# Documents produced by Doxygen are derivative works derived from the +# input used in their production; they are not affected by this license. + +all: FORCE + @xcopy /s /q /i ..\examples ..\html\examples + set DOXYGEN_DOCDIR=. + set VERSION=$(VERSION) + $(DOXYGEN)\bin\doxygen + @del ..\latex\refman.tex + @copy doxygen_logo*.gif ..\html + @copy Makefile.latex ..\latex\Makefile + @sed -e "s/\$$VERSION/$(VERSION)/g" doxygen_manual.tex >..\latex\doxygen_manual.tex + @sed -e "s/\$$VERSION/$(VERSION)/g" doxygen.sty >..\latex\doxygen.sty + @copy doxygen_logo.eps ..\latex + +clean: + del /s /q ..\html ..\latex + +FORCE: diff --git a/doc/doxygen_manual.tex b/doc/doxygen_manual.tex index a9448be..833540e 100644 --- a/doc/doxygen_manual.tex +++ b/doc/doxygen_manual.tex @@ -61,6 +61,7 @@ Written by Dimitri van Heesch\\[2ex] \input{doxygen_usage} \input{doxytag_usage} \input{doxysearch_usage} +\input{doxywizard_usage} \input{installdox_usage} \input{output} \input{autolink} diff --git a/doc/install.doc b/doc/install.doc index 1bb1dd2..1a065a2 100644 --- a/doc/install.doc +++ b/doc/install.doc @@ -337,29 +337,20 @@ doxygen for Windows. Here is what is required: