From b8fc0a1a1ee9a7b346632707b944f6e80f441236 Mon Sep 17 00:00:00 2001 From: Adrian Negreanu Date: Wed, 11 Dec 2013 23:07:27 +0200 Subject: usage: make -d print dev doxygen options Signed-off-by: Adrian Negreanu --- src/doxygen.cpp | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 9d820cb..65facdf 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -9772,6 +9772,31 @@ static void dumpSymbolMap() } } +// print developer options of doxygen +static void devUsage() +{ + msg("developer parameters:\n"); + msg("-m dump symbol map\n"); + msg("-b output to wizard\n"); + msg("-T activates output generation via Django like template\n"); + msg("-d Enable a debug level, such as:\n"); + msg("\tfindmembers\n"); + msg("\tfunctions\n"); + msg("\tvariables\n"); + msg("\tpreprocessor\n"); + msg("\tclasses\n"); + msg("\tcommentcnv\n"); + msg("\tcommentscan\n"); + msg("\tvalidate\n"); + msg("\tprinttree\n"); + msg("\ttime\n"); + msg("\textcmd\n"); + msg("\tmarkdown\n"); + msg("\tfilteroutput\n"); + msg("\tlex\n"); +} + + //---------------------------------------------------------------------------- // print the usage of doxygen @@ -9799,6 +9824,7 @@ static void usage(const char *name) msg(" RTF: %s -e rtf extensionsFile\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"); } //---------------------------------------------------------------------------- @@ -10020,6 +10046,7 @@ void readConfiguration(int argc, char **argv) if (!debugLabel) { err("option \"-d\" is missing debug specifier.\n"); + devUsage(); cleanUpDoxygen(); exit(1); } -- cgit v0.12 From 0c8edb7bb0b2f9bf8574e1a864a775a212bac868 Mon Sep 17 00:00:00 2001 From: albert-github Date: Sat, 14 Dec 2013 12:35:46 +0100 Subject: doxygen version 1.8.5 throws many "Internal Inconsistency" errors when parsing .idl files A number of error messages lacked the '\n' character --- src/namespacedef.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/namespacedef.cpp b/src/namespacedef.cpp index 81b9a51..c0915b3 100644 --- a/src/namespacedef.cpp +++ b/src/namespacedef.cpp @@ -891,7 +891,7 @@ void NamespaceSDict::writeDeclaration(OutputList &ol,const char *title, { if (nd->isConstantGroup()) { - err("Internal inconsistency: constant group but not IDL?"); + err("Internal inconsistency: constant group but not IDL?\n"); } found=TRUE; break; @@ -936,7 +936,7 @@ void NamespaceSDict::writeDeclaration(OutputList &ol,const char *title, } else { - err("Internal inconsistency: namespace in IDL not module or cg"); + err("Internal inconsistency: namespace in IDL not module or cg\n"); } } ol.insertMemberAlign(); -- cgit v0.12 From cdbcb67c28d1f11b086713906afa8e0963065483 Mon Sep 17 00:00:00 2001 From: albert-github Date: Sat, 14 Dec 2013 15:22:57 +0100 Subject: usage: make -d print dev doxygen options This is an extension / improvement to the pull request 67 from groleo - make printing of -d levels more flexible (when adding a new one this is now done automatically) - layout of the message --- src/debug.cpp | 12 ++++++++++++ src/debug.h | 1 + src/doxygen.cpp | 25 ++++++------------------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/debug.cpp b/src/debug.cpp index 1942355..a2b2707 100644 --- a/src/debug.cpp +++ b/src/debug.cpp @@ -21,6 +21,7 @@ #include #include "debug.h" +#include "message.h" //------------------------------------------------------------------------ @@ -120,3 +121,14 @@ bool Debug::isFlagSet(DebugMask mask) return (curMask & mask)!=0; } +void Debug::printFlags(void) +{ + int i; + for (i = 0; i < sizeof(s_labels)/sizeof(*s_labels); i++) + { + if (s_labels[i].name) + { + msg("\t%s\n",s_labels[i].name); + } + } +} diff --git a/src/debug.h b/src/debug.h index 29f91bd..e1affab 100644 --- a/src/debug.h +++ b/src/debug.h @@ -43,6 +43,7 @@ class Debug static int setFlag(const char *label); static void clearFlag(const char *label); static bool isFlagSet(DebugMask mask); + static void printFlags(void); static void setPriority(int p); private: diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 65facdf..1fb2e09 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -9775,25 +9775,12 @@ static void dumpSymbolMap() // print developer options of doxygen static void devUsage() { - msg("developer parameters:\n"); - msg("-m dump symbol map\n"); - msg("-b output to wizard\n"); - msg("-T activates output generation via Django like template\n"); - msg("-d Enable a debug level, such as:\n"); - msg("\tfindmembers\n"); - msg("\tfunctions\n"); - msg("\tvariables\n"); - msg("\tpreprocessor\n"); - msg("\tclasses\n"); - msg("\tcommentcnv\n"); - msg("\tcommentscan\n"); - msg("\tvalidate\n"); - msg("\tprinttree\n"); - msg("\ttime\n"); - msg("\textcmd\n"); - msg("\tmarkdown\n"); - msg("\tfilteroutput\n"); - msg("\tlex\n"); + msg("Developer parameters:\n"); + msg(" -m dump symbol map\n"); + msg(" -b output to wizard\n"); + msg(" -T activates output generation via Django like template\n"); + msg(" -d enable a debug level, such as (multiple invocations of -d are possible):\n"); + Debug::printFlags(); } -- cgit v0.12