Merge branch 'master' of github.com:doxygen/doxygen

4 files changed, 29 insertions, 2 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 <qdict.h>
 
 #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 e494356..ba1212a 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -9772,6 +9772,18 @@ 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 <level>  enable a debug level, such as (multiple invocations of -d are possible):\n");
+  Debug::printFlags();
+}
+
+
 //----------------------------------------------------------------------------
 // print the usage of doxygen
 
@@ -9799,6 +9811,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 +10033,7 @@ void readConfiguration(int argc, char **argv)
         if (!debugLabel)
         {
           err("option \"-d\" is missing debug specifier.\n");
+          devUsage();
           cleanUpDoxygen();
           exit(1);
         }
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();