doc: Update manpages

2 files changed, 20 insertions, 12 deletions

diff --git a/utils/gen_manpage.sh b/utils/gen_manpage.sh
index da06894..3007b86 100755
--- a/utils/gen_manpage.sh
+++ b/utils/gen_manpage.sh
@@ -2,17 +2,18 @@
 
 # /usr/share/man/man8/createrepo_c.8.gz
 
-EXPECTED_ARGS=3
+EXPECTED_ARGS=4
 if [ $# -ne $EXPECTED_ARGS ]
 then
-    echo "Usage: `basename $0` <createrepo_input_file> <mergerepo_input_file> <outputdir>"
+    echo "Usage: `basename $0` <createrepo_input_file> <mergerepo_input_file> <modifyrepo_input_file> <outputdir>"
     echo
-    echo "Example: `basename $0` src/cmd_parser.c src/mergerepo_c.c doc/"
+    echo "Example: `basename $0` src/cmd_parser.c src/mergerepo_c.c src/modifyrepo_c.c doc/"
     exit 1
 fi
 
 MY_DIR=`dirname $0`
 MY_DIR="$MY_DIR/"
 
-python $MY_DIR/gen_rst.py $1 | rst2man | gzip > $3/createrepo_c.8.gz
-python $MY_DIR/gen_rst.py $2 --mergerepo | rst2man | gzip > $3/mergerepo_c.8.gz
+python $MY_DIR/gen_rst.py $1 | rst2man | gzip > $4/createrepo_c.8.gz
+python $MY_DIR/gen_rst.py $2 --mergerepo | rst2man | gzip > $4/mergerepo_c.8.gz
+python $MY_DIR/gen_rst.py $3 --modifyrepo | rst2man | gzip > $4/modifyrepo_c.8.gz
diff --git a/utils/gen_rst.py b/utils/gen_rst.py
index afedbb9..cbbc836 100755
--- a/utils/gen_rst.py
+++ b/utils/gen_rst.py
@@ -66,7 +66,7 @@ def parse_arguments_from_c_file(filename):
         print "Error: Cannot open file %s" % filename
         return args
 
-    re_cmd_entries = re.compile(r"static[ ]+GOptionEntry[^{]*{(?P<entries>.*)\s*NULL\s*}[,]?\s*};", re.MULTILINE|re.DOTALL)
+    re_cmd_entries = re.compile(r"\s*(static|const)[ ]+GOptionEntry[^{]*{(?P<entries>.*)\s*NULL\s*}[,]?\s*};", re.MULTILINE|re.DOTALL)
     match = re_cmd_entries.search(content)
     if not match:
         print "Warning: Cannot find GOptionEntry section in %s" % filename
@@ -133,8 +133,9 @@ def parse_arguments_from_c_file(filename):
 
 
 if __name__ == "__main__":
-    parser = OptionParser('usage: %prog [options] <filename> [--mergerepo]')
+    parser = OptionParser('usage: %prog [options] <filename> [--mergerepo|--modifyrepo]')
     parser.add_option('-m', '--mergerepo', action="store_true", help="Gen rst for mergerepo")
+    parser.add_option('-r', '--modifyrepo', action="store_true", help="Gen rst for modifyrepo")
     options, args = parser.parse_args()
 
     if len(args) < 1:
@@ -143,16 +144,22 @@ if __name__ == "__main__":
 
     args = parse_arguments_from_c_file(args[0])
 
-    if not options.mergerepo:
-        NAME = "createrepo_c"
+    if options.mergerepo:
+        NAME = "mergerepo_c"
         info = Info(NAME,
-                description="C implementation of createrepo",
+                description="C implementation of mergerepo",
+                synopsis="%s [options] <directory>" % (NAME,),
+                options=args)
+    elif options.modifyrepo:
+        NAME = "modifyrepo_c"
+        info = Info(NAME,
+                description="C implementation of modifyrepo",
                 synopsis="%s [options] <directory>" % (NAME,),
                 options=args)
     else:
-        NAME = "mergerepo_c"
+        NAME = "createrepo_c"
         info = Info(NAME,
-                description="C implementation of mergerepo",
+                description="C implementation of createrepo",
                 synopsis="%s [options] <directory>" % (NAME,),
                 options=args)