Commit 79bf453d authored by mueller's avatar mueller

mods for doxygen-0.49-990901

parent f1812884
DOXYGEN Version 0.49-990829 DOXYGEN Version 0.49-990901
CONTENTS CONTENTS
-------- --------
...@@ -14,17 +14,17 @@ INSTALLATION INSTRUCTIONS FOR UNIX: ...@@ -14,17 +14,17 @@ INSTALLATION INSTRUCTIONS FOR UNIX:
1. Unpack the archive, unless you already have: 1. Unpack the archive, unless you already have:
gunzip doxygen-0.49-990829.src.tar.gz # uncompress the archive gunzip doxygen-0.49-990901.src.tar.gz # uncompress the archive
tar xf doxygen-0.49-990829.src.tar # unpack it tar xf doxygen-0.49-990901.src.tar # unpack it
2. Run the configure script: 2. Run the configure script:
sh ./configure sh ./configure
The script tries to determine the platform you use, the location The script tries to determine the platform you use, the location
of the Qt library, the make tool and the perl interpreter. of the Qt library, the make tool (which _must_ be GNU make) and the perl
It will report what it finds. Use configure --help interpreter. It will report what it finds. Use configure --help
to see how to override or change the default settings. to see how to override or change the default or detected settings.
3. Compile the program by running make: 3. Compile the program by running make:
...@@ -34,7 +34,7 @@ INSTALLATION INSTRUCTIONS FOR UNIX: ...@@ -34,7 +34,7 @@ INSTALLATION INSTRUCTIONS FOR UNIX:
doxytag, and doxysearch) should be available in the bin directory of the doxytag, and doxysearch) should be available in the bin directory of the
distribution. distribution.
5. Generate the user manual. 5. Generate the user manual (optional, will also be done in step 6).
make docs make docs
...@@ -54,6 +54,13 @@ INSTALLATION INSTRUCTIONS FOR UNIX: ...@@ -54,6 +54,13 @@ INSTALLATION INSTRUCTIONS FOR UNIX:
directory of the distribution. Just send it to a postscript printer to directory of the distribution. Just send it to a postscript printer to
print it or use ghostview to view it. print it or use ghostview to view it.
6. Install the doxygen binaries, manual and examples
make install
Binaries are install to the directory <prefix>/bin
Documentation and examples to the directory <prefix>/share/doxygen
INSTALLATION INSTRUCTIONS FOR WINDOWS: INSTALLATION INSTRUCTIONS FOR WINDOWS:
-------------------------------------- --------------------------------------
...@@ -173,4 +180,4 @@ The latest version of doxygen can be obtained at ...@@ -173,4 +180,4 @@ The latest version of doxygen can be obtained at
Enjoy, Enjoy,
Dimitri van Heesch (29 August 1999) Dimitri van Heesch (01 September 1999)
all: src/version.cpp all: src/version.cpp
cd src ; $(MAKE) cd src ; $(MAKE)
...@@ -16,6 +17,20 @@ distclean: clean ...@@ -16,6 +17,20 @@ distclean: clean
-rm -f src/doxygen.pro src/doxytag.pro src/doxysearch.pro -rm -f src/doxygen.pro src/doxytag.pro src/doxysearch.pro
-rm -f src/version.cpp -rm -f src/version.cpp
install:
$(INSTTOOL) -d $(INSTALL)/bin
$(INSTTOOL) -d $(INSTALL)/share/doxygen/doc
$(INSTTOOL) -d $(INSTALL)/share/doxygen/examples
$(INSTTOOL) -m 755 bin/doxy* $(INSTALL)/bin
cp -r doc $(INSTALL)/share/doxygen
cp -r examples $(INSTALL)/share/doxygen
echo "DOXYGEN = $(INSTALL)" > $(INSTALL)/share/doxygen/doc/Makefile
echo "DOXYDOCS = $(INSTALL)/share/doxygen" >> $(INSTALL)/share/doxygen/doc/Makefile
echo "VERSION = $(VERSION)" >> $(INSTALL)/share/doxygen/doc/Makefile
cat doc/Makefile.in >> $(INSTALL)/share/doxygen/doc/Makefile
cd $(INSTALL)/share/doxygen/examples ; $(MAKE)
cd $(INSTALL)/share/doxygen/doc ; $(MAKE)
docs: FORCE docs: FORCE
cd examples ; $(MAKE) cd examples ; $(MAKE)
cd doc ; $(MAKE) cd doc ; $(MAKE)
......
DOXYGEN Version 0.49-990829 DOXYGEN Version 0.49-990901
Please read INSTALL for compilation instructions. Please read INSTALL for compilation instructions.
...@@ -7,4 +7,4 @@ The latest version of doxygen can be obtained at ...@@ -7,4 +7,4 @@ The latest version of doxygen can be obtained at
Enjoy, Enjoy,
Dimitri van Heesch (29 August 1999) Dimitri van Heesch (01 September 1999)
0.49-990829 0.49-990901
...@@ -20,12 +20,15 @@ f_debug=NO ...@@ -20,12 +20,15 @@ f_debug=NO
f_shared=YES f_shared=YES
f_make=NO f_make=NO
f_perl=NO f_perl=NO
f_qt_include=NO
f_qt_library=NO
f_plf_auto=NO f_plf_auto=NO
f_prefix=/usr/local
f_insttool=install
while test -n "$1"; do while test -n "$1"; do
case $1 in case $1 in
--prefix)
shift; f_prefix=$1
;;
--shared) --shared)
f_shared=YES f_shared=YES
;; ;;
...@@ -38,12 +41,6 @@ while test -n "$1"; do ...@@ -38,12 +41,6 @@ while test -n "$1"; do
--debug) --debug)
f_debug=YES f_debug=YES
;; ;;
--qt-includes)
shift; f_qt_include=$1
;;
--qt-libs)
shift; f_qt_library=$1
;;
--platform) --platform)
shift; f_platform=$1 shift; f_platform=$1
;; ;;
...@@ -53,6 +50,9 @@ while test -n "$1"; do ...@@ -53,6 +50,9 @@ while test -n "$1"; do
--perl) --perl)
shift; f_perl=$1 shift; f_perl=$1
;; ;;
--install)
shift; f_insttool=$1
;;
-h | -help | --help) -h | -help | --help)
f_help=y f_help=y
;; ;;
...@@ -68,8 +68,8 @@ done ...@@ -68,8 +68,8 @@ done
if test "$f_help" = y; then if test "$f_help" = y; then
cat <<EOF cat <<EOF
Usage: $0 [--help] [--shared] [--static] [--release] [--debug] Usage: $0 [--help] [--shared] [--static] [--release] [--debug]
[--perl name] [--make name] [--qt-includes name] [--qt-libs name] [--perl name] [--make name] [--platform target] [--prefix]
[--platform target] [--install]
Options: Options:
...@@ -84,18 +84,18 @@ Options: ...@@ -84,18 +84,18 @@ Options:
--perl name Use \`name' as the name of the perl interpreter --perl name Use \`name' as the name of the perl interpreter
[default: autodetect] [default: autodetect]
--make name Use \`name' as the name of the make tool --make name Use \`name' as the name of the GNU make tool
[default: autodetect]
--qt-includes path Use \`path' as the path to the qt include directory
[default: autodetect]
--qt-libs path Use \`path' as the path to the qt library directory
[default: autodetect] [default: autodetect]
--platform target Do not detect platform but use \`target' instead. --platform target Do not detect platform but use \`target' instead.
See PLATFORMS for a list of possibilities See PLATFORMS for a list of possibilities
--prefix dir Installation prefix directory
[default: /usr/local]
--install name name of the GNU install tool
[default: install]
EOF EOF
test "$f_error" = y && exit 1 test "$f_error" = y && exit 1
exit 0; exit 0;
...@@ -189,63 +189,30 @@ fi ...@@ -189,63 +189,30 @@ fi
#- check for qt -------------------------------------------------------------- #- check for qt --------------------------------------------------------------
echo -n " Checking for Qt..." echo -n " Checking for Qt..."
if test "$f_qt_include" = NO; then if test -z "$QTDIR"; then
qt_incdirs="/usr/lib/qt/include /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt" echo "QTDIR not set!"
test -n "$QTDIR" && qt_incdirs="$QTDIR/include $QTDIR $qt_incdirs"
qt_incdir=NO
for i in $qt_incdirs; do
if test -r "$i/qlist.h"; then
qt_incdir=$i
break
else
echo "Tried include directory $i..."
fi
done
f_qt_include="$qt_incdir"
fi
if test "$f_qt_library" = NO; then
qt_libdirs="/usr/lib/qt/lib /usr/X11R6/lib /usr/lib /usr/local/qt/lib /usr/lib/qt"
if test -n "$LD_LIBRARY_PATH"; then
qt_ldpaths=`echo $LD_LIBRARY_PATH | sed 's%:% %'`
qt_libdirs="$qt_ldpaths $qt_libdirs"
fi
test -n "$QTDIR" && qt_libdirs="$QTDIR/lib $QTDIR $qt_libdirs"
qt_libdir=NO
for i in $qt_libdirs; do
try="ls -1 $i/libqt*"
if test=`eval $try 2>/dev/null`; then
qt_libdir=$i;
break
else
echo "Tried library directory $i..."
fi
done
f_qt_library="$qt_libdir"
fi
if test "$f_qt_include" = NO || test "$f_qt_library" = NO; then
if test "$f_qt_include" = NO && test "$f_qt_library" = NO; then
echo "not found!"
echo echo
elif test "$f_qt_include" = NO; then echo "tmake requires the QTDIR environment variable to be set."
echo "include files not found!" echo "check your Qt installation!"
else exit 2
echo "libraries not found!" else
if ! test -d "$QTDIR/lib"; then
echo "QTDIR is set, but library directory does not exist!"
exit 2
fi fi
if ! test -d "$QTDIR/include"; then
echo "QTDIR is set, but include directory does not exist!"
exit 2 exit 2
fi
echo " headers $QTDIR/include,"
echo " libraries $QTDIR/lib"
fi fi
echo "libraries: $f_qt_library"
echo " headers: $f_qt_include"
# - check for make ------------------------------------------------------------ # - check for make ------------------------------------------------------------
echo -n " Checking for make tool... " echo -n " Checking for GNU make tool... "
if test "$f_make" = NO; then if test "$f_make" = NO; then
make_names="make gmake pmake" make_names="gmake make"
make_dirs="/usr/bin /usr/local/bin /bin /sbin $bin_dirs" make_dirs="/usr/bin /usr/local/bin /bin /sbin $bin_dirs"
make_prog=NO make_prog=NO
for i in $make_names; do for i in $make_names; do
...@@ -312,6 +279,11 @@ MAKE = $f_make ...@@ -312,6 +279,11 @@ MAKE = $f_make
PERL = $f_perl PERL = $f_perl
RM = rm -f RM = rm -f
VERSION = `cat VERSION` VERSION = `cat VERSION`
INSTALL = $f_prefix
INSTTOOL = $f_insttool
DOXYDOCS = $PWD
export TMAKEPATH
EOF EOF
touch .tmakeconfig touch .tmakeconfig
......
...@@ -7,6 +7,7 @@ WARNINGS = YES ...@@ -7,6 +7,7 @@ WARNINGS = YES
DISABLE_INDEX = YES DISABLE_INDEX = YES
EXTRACT_ALL = NO EXTRACT_ALL = NO
EXTRACT_PRIVATE = NO EXTRACT_PRIVATE = NO
GENERATE_MAN = NO
GENERATE_LATEX = YES GENERATE_LATEX = YES
GENERATE_HTML = YES GENERATE_HTML = YES
ENABLE_PREPROCESSING = NO ENABLE_PREPROCESSING = NO
......
all: FORCE all: FORCE
DOXYGEN_DOCDIR=$(DOXYGEN); \ DOXYGEN_DOCDIR=$(DOXYDOCS); \
export DOXYGEN_DOCDIR; \ export DOXYGEN_DOCDIR; \
VERSION=$(VERSION) ; \ VERSION=$(VERSION) ; \
export VERSION; \ export VERSION; \
......
VERSION = $(VERSION)
DOXYDIR = ../bin
all: class/html/index.html \ all: class/html/index.html \
define/html/index.html \ define/html/index.html \
...@@ -27,63 +26,63 @@ clean: ...@@ -27,63 +26,63 @@ clean:
autolink tag restypedef afterdoc template autolink tag restypedef afterdoc template
class/html/index.html: class.h class.cfg class/html/index.html: class.h class.cfg
$(DOXYDIR)/doxygen class.cfg $(DOXYGEN)/bin/doxygen class.cfg
define/html/index.html: define.h define.cfg define/html/index.html: define.h define.cfg
$(DOXYDIR)/doxygen define.cfg $(DOXYGEN)/bin/doxygen define.cfg
enum/html/index.html: enum.h enum.cfg enum/html/index.html: enum.h enum.cfg
$(DOXYDIR)/doxygen enum.cfg $(DOXYGEN)/bin/doxygen enum.cfg
file/html/index.html: file.h file.cfg file/html/index.html: file.h file.cfg
$(DOXYDIR)/doxygen file.cfg $(DOXYGEN)/bin/doxygen file.cfg
func/html/index.html: func.h func.cfg func/html/index.html: func.h func.cfg
$(DOXYDIR)/doxygen func.cfg $(DOXYGEN)/bin/doxygen func.cfg
page/html/index.html: page.doc page.cfg page/html/index.html: page.doc page.cfg
$(DOXYDIR)/doxygen page.cfg $(DOXYGEN)/bin/doxygen page.cfg
relates/html/index.html: relates.cpp relates.cfg relates/html/index.html: relates.cpp relates.cfg
$(DOXYDIR)/doxygen relates.cfg $(DOXYGEN)/bin/doxygen relates.cfg
author/html/index.html: author.cpp author.cfg author/html/index.html: author.cpp author.cfg
$(DOXYDIR)/doxygen author.cfg $(DOXYGEN)/bin/doxygen author.cfg
par/html/index.html: par.cpp par.cfg par/html/index.html: par.cpp par.cfg
$(DOXYDIR)/doxygen par.cfg $(DOXYGEN)/bin/doxygen par.cfg
overload/html/index.html: overload.cpp overload.cfg overload/html/index.html: overload.cpp overload.cfg
$(DOXYDIR)/doxygen overload.cfg $(DOXYGEN)/bin/doxygen overload.cfg
example/html/index.html: example.cpp example_test.cpp example.cfg example/html/index.html: example.cpp example_test.cpp example.cfg
$(DOXYDIR)/doxygen example.cfg $(DOXYGEN)/bin/doxygen example.cfg
include/html/index.html: include.cpp example_test.cpp include.cfg include/html/index.html: include.cpp example_test.cpp include.cfg
$(DOXYDIR)/doxygen include.cfg $(DOXYGEN)/bin/doxygen include.cfg
qtstyle/html/index.html: qtstyle.cpp qtstyle.cfg qtstyle/html/index.html: qtstyle.cpp qtstyle.cfg
$(DOXYDIR)/doxygen qtstyle.cfg $(DOXYGEN)/bin/doxygen qtstyle.cfg
jdstyle/html/index.html: jdstyle.cpp jdstyle.cfg jdstyle/html/index.html: jdstyle.cpp jdstyle.cfg
$(DOXYDIR)/doxygen jdstyle.cfg $(DOXYGEN)/bin/doxygen jdstyle.cfg
structcmd/html/index.html: structcmd.h structcmd.cfg structcmd/html/index.html: structcmd.h structcmd.cfg
$(DOXYDIR)/doxygen structcmd.cfg $(DOXYGEN)/bin/doxygen structcmd.cfg
autolink/html/index.html: autolink.cpp autolink.cfg autolink/html/index.html: autolink.cpp autolink.cfg
$(DOXYDIR)/doxygen autolink.cfg $(DOXYGEN)/bin/doxygen autolink.cfg
tag/html/index.html: tag.cpp tag.cfg tag/html/index.html: tag.cpp tag.cfg
$(DOXYDIR)/doxygen tag.cfg $(DOXYGEN)/bin/doxygen tag.cfg
sed -e "1,1s.perl.$(PERL).g" tag/html/installdox >tag/html/installdox.perl sed -e "1,1s.perl.$(PERL).g" tag/html/installdox >tag/html/installdox.perl
cd tag/html ; $(PERL) installdox.perl -lexample.tag@../../example/html cd tag/html ; $(PERL) installdox.perl -lexample.tag@../../example/html
restypedef/html/index.html: restypedef.cpp restypedef.cfg restypedef/html/index.html: restypedef.cpp restypedef.cfg
$(DOXYDIR)/doxygen restypedef.cfg $(DOXYGEN)/bin/doxygen restypedef.cfg
afterdoc/html/index.html: afterdoc.h afterdoc.cfg afterdoc/html/index.html: afterdoc.h afterdoc.cfg
$(DOXYDIR)/doxygen afterdoc.cfg $(DOXYGEN)/bin/doxygen afterdoc.cfg
template/html/index.html: templ.cpp templ.cfg template/html/index.html: templ.cpp templ.cfg
$(DOXYDIR)/doxygen templ.cfg $(DOXYGEN)/bin/doxygen templ.cfg
...@@ -224,7 +224,7 @@ void parseFuncDecl(const QCString &decl,QCString &cl,QCString &ctl,QCString &t, ...@@ -224,7 +224,7 @@ void parseFuncDecl(const QCString &decl,QCString &cl,QCString &ctl,QCString &t,
cl=scope.copy(); cl=scope.copy();
//printf("scope=`%s'\n",scope.data()); //printf("scope=`%s'\n",scope.data());
int il,ir; int il=0,ir=0;
if ((il=cl.find('<'))!=-1 && (ir=cl.findRev('>'))!=-1) // split up scope and template arguments if ((il=cl.find('<'))!=-1 && (ir=cl.findRev('>'))!=-1) // split up scope and template arguments
{ {
ctl=removeRedundantWhiteSpace(cl.mid(il,ir-il+1)); ctl=removeRedundantWhiteSpace(cl.mid(il,ir-il+1));
......
...@@ -885,7 +885,7 @@ BN [ \t\r\n] ...@@ -885,7 +885,7 @@ BN [ \t\r\n]
} }
*/ */
<CopyLine>{ID}/{BN}*"(" { <CopyLine>{ID}/{BN}*"(" {
Define *def; Define *def=0;
//printf("Search for define %s\n",yytext); //printf("Search for define %s\n",yytext);
if (includeStack.isEmpty() && if (includeStack.isEmpty() &&
Config::macroExpansionFlag && Config::macroExpansionFlag &&
......
...@@ -43,7 +43,7 @@ bool isId(char c) ...@@ -43,7 +43,7 @@ bool isId(char c)
QCString stripAnnonymousScope(const QCString &s) QCString stripAnnonymousScope(const QCString &s)
{ {
QCString result=s; QCString result=s;
int i; int i=0;
while (!result.isEmpty() && result.at(0)=='@' && (i=result.find("::"))!=-1) while (!result.isEmpty() && result.at(0)=='@' && (i=result.find("::"))!=-1)
{ {
result=result.right(result.length()-i-2); result=result.right(result.length()-i-2);
...@@ -1058,7 +1058,7 @@ bool getDefs(const QCString &scName,const QCString &memberName, ...@@ -1058,7 +1058,7 @@ bool getDefs(const QCString &scName,const QCString &memberName,
//printf("Search for name=%s args=%s in scope=%s\n", //printf("Search for name=%s args=%s in scope=%s\n",
// memberName.data(),args,scopeName.data()); // memberName.data(),args,scopeName.data());
int is,im,pm=0; int is,im=0,pm=0;
// strip common part of the scope from the scopeName // strip common part of the scope from the scopeName
while ((is=scopeName.findRev("::"))!=-1 && while ((is=scopeName.findRev("::"))!=-1 &&
(im=memberName.find("::",pm))!=-1 && (im=memberName.find("::",pm))!=-1 &&
...@@ -1745,7 +1745,7 @@ void setFileNameForSections(QList<QCString> *anchorList,const char *fileName) ...@@ -1745,7 +1745,7 @@ void setFileNameForSections(QList<QCString> *anchorList,const char *fileName)
QCString *s=anchorList->first(); QCString *s=anchorList->first();
while (s) while (s)
{ {
SectionInfo *si; SectionInfo *si=0;
if (!s->isEmpty() && (si=sectionDict[*s])) si->fileName=fileName; if (!s->isEmpty() && (si=sectionDict[*s])) si->fileName=fileName;
s=anchorList->next(); s=anchorList->next();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment