diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2018-09-15 15:12:08 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-15 15:12:08 (GMT) |
commit | 6c1c88f41aa68e6999bfa4b72e37c5a8034588a5 (patch) | |
tree | c7e362d4241f6f4e30b0f85afa08b31506bd12a5 /src/doxygen.cpp | |
parent | 7a24844b214005b4a12005c4d3e3c2c998dd8ae5 (diff) | |
parent | ed1fb80b55bab16443b211ebeb1cd45bb630b08b (diff) | |
download | Doxygen-6c1c88f41aa68e6999bfa4b72e37c5a8034588a5.zip Doxygen-6c1c88f41aa68e6999bfa4b72e37c5a8034588a5.tar.gz Doxygen-6c1c88f41aa68e6999bfa4b72e37c5a8034588a5.tar.bz2 |
Merge pull request #6510 from albert-github/feature/doxyfile_differnces
Difference between standard and used Doxyfile
Diffstat (limited to 'src/doxygen.cpp')
-rw-r--r-- | src/doxygen.cpp | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp index bf93a9b..f0fc650 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -9151,7 +9151,24 @@ static void generateConfigFile(const char *configFile,bool shortList, exit(1); } } - +static void compareDoxyfile() +{ + QFile f; + char configFile[2]; + configFile[0] = '-'; + configFile[1] = '\0'; + bool fileOpened=openOutputFile(configFile,f); + if (fileOpened) + { + FTextStream t(&f); + Config::compareDoxyfile(t); + } + else + { + err("Cannot open file %s for writing\n",configFile); + exit(1); + } +} //---------------------------------------------------------------------------- // read and parse a tag file @@ -10009,6 +10026,8 @@ static void usage(const char *name) msg(" LaTeX: %s -w latex headerFile footerFile styleSheetFile [configFile]\n\n",name); msg("6) Use doxygen to generate a rtf extensions file\n"); msg(" RTF: %s -e rtf extensionsFile\n\n",name); + msg("7) Use doxygen to compare the used configuration file with the template configuration file\n"); + msg(" %s -x [configFile]\n\n",name); msg("If -s is specified the comments of the configuration items in the config file will be omitted.\n"); msg("If configName is omitted `Doxyfile' will be used as a default.\n\n"); msg("-v print version string\n"); @@ -10211,6 +10230,7 @@ void readConfiguration(int argc, char **argv) const char *formatName; bool genConfig=FALSE; bool shortList=FALSE; + bool diffList=FALSE; bool updateConfig=FALSE; int retVal; while (optind<argc && argv[optind][0]=='-' && @@ -10248,6 +10268,9 @@ void readConfiguration(int argc, char **argv) exit(1); } break; + case 'x': + diffList=TRUE; + break; case 's': shortList=TRUE; break; @@ -10498,6 +10521,7 @@ void readConfiguration(int argc, char **argv) exit(1); } } + if (genConfig && g_useOutputTemplate) { generateTemplateFiles("templates"); @@ -10519,6 +10543,13 @@ void readConfiguration(int argc, char **argv) exit(1); } + if (diffList) + { + compareDoxyfile(); + cleanUpDoxygen(); + exit(0); + } + if (updateConfig) { generateConfigFile(configName,shortList,TRUE); |