Parcourir la source

[trac1093] argument order problem

also fixed usage output and doxygen description
Jelte Jansen il y a 14 ans
Parent
commit
0529433796
2 fichiers modifiés avec 6 ajouts et 4 suppressions
  1. 5 3
      src/lib/log/compiler/message.cc
  2. 1 1
      src/lib/python/isc/config/Makefile.am

+ 5 - 3
src/lib/log/compiler/message.cc

@@ -55,13 +55,15 @@ static const char* VERSION = "1.0-0";
 /// \b Invocation<BR>
 /// The program is invoked with the command:
 ///
-/// <tt>message [-v | -h | \<message-file\>]</tt>
+/// <tt>message [-v | -h | -p | -d <dir> | \<message-file\>]</tt>
 ///
 /// It reads the message file and writes out two files of the same name in the
 /// default directory but with extensions of .h and .cc.
 ///
 /// \-v causes it to print the version number and exit. \-h prints a help
-/// message (and exits).
+/// message (and exits). -p sets the output to python. -d <dir> will make
+/// it write the output file(s) to dir instead of current working
+/// directory
 
 
 /// \brief Print Version
@@ -80,7 +82,7 @@ version() {
 void
 usage() {
     cout <<
-        "Usage: message [-h] [-v] [-p] <message-file>\n" <<
+        "Usage: message [-h] [-v] [-p] [-d dir] <message-file>\n" <<
         "\n" <<
         "-h       Print this message and exit\n" <<
         "-v       Print the program version and exit\n" <<

+ 1 - 1
src/lib/python/isc/config/Makefile.am

@@ -10,7 +10,7 @@ cfgmgr_messages.py: cfgmgr_messages.mes
 	$(top_builddir)/src/lib/log/compiler/message -p $(top_srcdir)/src/lib/python/isc/config/cfgmgr_messages.mes
 
 $(top_builddir)/src/lib/python/config_messages.py: config_messages.mes
-	$(top_builddir)/src/lib/log/compiler/message -p $(top_srcdir)/src/lib/python/isc/config/config_messages.mes -d $(top_builddir)/src/lib/python
+	$(top_builddir)/src/lib/log/compiler/message -p -d $(top_builddir)/src/lib/python $(top_srcdir)/src/lib/python/isc/config/config_messages.mes
 
 CLEANFILES =  cfgmgr_messages.py cfgmgr_messages.pyc
 CLEANFILES += $(top_builddir)/src/lib/python/config_messages.py