diff options
Diffstat (limited to 'src/doxygen.cpp')
-rw-r--r-- | src/doxygen.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 124c980..ca6c8ef 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -1,6 +1,6 @@ /****************************************************************************** * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 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 @@ -9134,7 +9134,7 @@ void dumpConfigAsXML() static void usage(const char *name) { - msg("Doxygen version %s\nCopyright Dimitri van Heesch 1997-2010\n\n",versionString); + msg("Doxygen version %s\nCopyright Dimitri van Heesch 1997-2011\n\n",versionString); msg("You can use doxygen in a number of ways:\n\n"); msg("1) Use doxygen to generate a template configuration file:\n"); msg(" %s [-s] -g [configName]\n\n",name); @@ -9393,9 +9393,10 @@ void readConfiguration(int argc, char **argv) } else if (stricmp(formatName,"html")==0) { - if (optind+4<argc) + if (optind+4<argc || QFileInfo("Doxyfile").exists()) { - if (!Config::instance()->parse(argv[optind+4])) + QCString df = optind+4<argc ? argv[optind+4] : QCString("Doxyfile"); + if (!Config::instance()->parse(df)) { err("error opening or reading configuration file %s!\n",argv[optind+4]); cleanUpDoxygen(); @@ -9403,6 +9404,10 @@ void readConfiguration(int argc, char **argv) } Config::instance()->substituteEnvironmentVars(); Config::instance()->convertStrToVal(); + // avoid bootstrapping issues when the config file already + // refers to the files that we are supposed to parse. + Config_getString("HTML_HEADER")=""; + Config_getString("HTML_FOOTER")=""; Config::instance()->check(); } else @@ -9451,6 +9456,7 @@ void readConfiguration(int argc, char **argv) } Config::instance()->substituteEnvironmentVars(); Config::instance()->convertStrToVal(); + Config_getString("LATEX_HEADER")=""; Config::instance()->check(); } else // use default config |