diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2013-08-22 12:32:51 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2013-08-22 12:32:51 (GMT) |
| commit | 9408941c0b0cfa21fbbdd81c687126a4b15dccd7 (patch) | |
| tree | aa0e395fd80e2f61a9ad367cfdc5e1fbe9e8d3dd | |
| parent | 44013ca546818852b918b30d7143e636d062e143 (diff) | |
| download | Doxygen-9408941c0b0cfa21fbbdd81c687126a4b15dccd7.zip Doxygen-9408941c0b0cfa21fbbdd81c687126a4b15dccd7.tar.gz Doxygen-9408941c0b0cfa21fbbdd81c687126a4b15dccd7.tar.bz2 | |
Bug 706236 - Confusing use of GENERATE_TAGFILE
| -rw-r--r-- | src/config.h | 1 | ||||
| -rw-r--r-- | src/config.l | 15 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/config.h b/src/config.h index bb9ccf0..7d72f52 100644 --- a/src/config.h +++ b/src/config.h @@ -543,6 +543,7 @@ class Config } private: + void checkFileName(const char *); QList<ConfigOption> *m_options; QList<ConfigOption> *m_obsolete; QList<ConfigOption> *m_disabled; diff --git a/src/config.l b/src/config.l index eb7c1c2..f3b0962 100644 --- a/src/config.l +++ b/src/config.l @@ -285,7 +285,7 @@ bool &Config::getBool(const char *fileName,int num,const char *name) const } else if (opt->kind()!=ConfigOption::O_Bool) { - config_err("%s<%d>: Internal error: Requested option %s not of integer type!\n",fileName,num,name); + config_err("%s<%d>: Internal error: Requested option %s not of boolean type!\n",fileName,num,name); exit(1); } return *((ConfigBool *)opt)->valueRef(); @@ -1045,6 +1045,18 @@ static void cleanUpPaths(QStrList &str) } } +void Config::checkFileName(const char *optionName) +{ + QCString &s = Config_getString(optionName); + QCString val = s.stripWhiteSpace().lower(); + if ((val=="yes" || val=="true" || val=="1" || val=="all") || + (val=="no" || val=="false" || val=="0" || val=="none")) + { + config_err("Error: file name expected for option %s, got %s instead. Ignoring...\n",optionName,s.data()); + s=""; // note tihe use of &s above: this will change the option value! + } +} + void Config::check() { //if (!projectName.isEmpty()) @@ -1536,6 +1548,7 @@ void Config::check() Config_getBool("EXTRACT_PACKAGE") = TRUE; } + checkFileName("GENERATE_TAGFILE"); } void Config::init() |