make dbk2man.py compatible with xmlto commandline #46

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 1e00f0fb1889f10121a95b96b66a956cf5ba90e3..526b10679a0259ae7f8be2e59c237f8e264a5121 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -156,12 +156,12 @@ manpages.tar : zziplib.xml zzipmmapped.xml zzipfseeko.xml
        ; then echo going to regenerate "$@" in subdir "'"man"'" \
        ; echo 'test ! -d man3 || rm man3/* ; test -d man3 || mkdir man3' \
        ;       test ! -d man3 || rm man3/* ; test -d man3 || mkdir man3  \
-       ; echo     '$(srcdir)/dbk2man.py -d man3 zziplib.xml' \
-       ; $(PYTHON) $(srcdir)/dbk2man.py -d man3 zziplib.xml  \
-       ; echo     '$(srcdir)/dbk2man.py -d man3 zzipmmapped.xml' \
-       ; $(PYTHON) $(srcdir)/dbk2man.py -d man3 zzipmmapped.xml  \
-       ; echo     '$(srcdir)/dbk2man.py -d man3 zzipfseeko.xml' \
-       ; $(PYTHON) $(srcdir)/dbk2man.py -d man3 zzipfseeko.xml  \
+       ; echo     '$(srcdir)/dbk2man.py -o man3 man zziplib.xml' \
+       ; $(PYTHON) $(srcdir)/dbk2man.py -o man3 man zziplib.xml  \
+       ; echo     '$(srcdir)/dbk2man.py -o man3 man zzipmmapped.xml' \
+       ; $(PYTHON) $(srcdir)/dbk2man.py -o man3 man zzipmmapped.xml  \
+       ; echo     '$(srcdir)/dbk2man.py -o man3 man zzipfseeko.xml' \
+       ; $(PYTHON) $(srcdir)/dbk2man.py -o man3 man zzipfseeko.xml  \
        ; if test -d man3/man3; then mv man3 man3_ \
        ;   mv man3_/man3 man3; rm -r man3_; fi \
        ; echo 'chmod 664 man3/*.3' \

diff --git a/docs/Makefile.in b/docs/Makefile.in
index 50d1e76b5dc2384a11164d46ed8f705e45afadd4..d04c677b0ee712f57b90a7eeea9490909eace121 100644 (file)
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -662,12 +662,12 @@ manpages.tar : zziplib.xml zzipmmapped.xml zzipfseeko.xml
        ; then echo going to regenerate "$@" in subdir "'"man"'" \
        ; echo 'test ! -d man3 || rm man3/* ; test -d man3 || mkdir man3' \
        ;       test ! -d man3 || rm man3/* ; test -d man3 || mkdir man3  \
-       ; echo     '$(srcdir)/dbk2man.py -d man3 zziplib.xml' \
-       ; $(PYTHON) $(srcdir)/dbk2man.py -d man3 zziplib.xml  \
-       ; echo     '$(srcdir)/dbk2man.py -d man3 zzipmmapped.xml' \
-       ; $(PYTHON) $(srcdir)/dbk2man.py -d man3 zzipmmapped.xml  \
-       ; echo     '$(srcdir)/dbk2man.py -d man3 zzipfseeko.xml' \
-       ; $(PYTHON) $(srcdir)/dbk2man.py -d man3 zzipfseeko.xml  \
+       ; echo     '$(srcdir)/dbk2man.py -o man3 man zziplib.xml' \
+       ; $(PYTHON) $(srcdir)/dbk2man.py -o man3 man zziplib.xml  \
+       ; echo     '$(srcdir)/dbk2man.py -o man3 man zzipmmapped.xml' \
+       ; $(PYTHON) $(srcdir)/dbk2man.py -o man3 man zzipmmapped.xml  \
+       ; echo     '$(srcdir)/dbk2man.py -o man3 man zzipfseeko.xml' \
+       ; $(PYTHON) $(srcdir)/dbk2man.py -o man3 man zzipfseeko.xml  \
        ; if test -d man3/man3; then mv man3 man3_ \
        ;   mv man3_/man3 man3; rm -r man3_; fi \
        ; echo 'chmod 664 man3/*.3' \

diff --git a/docs/dbk2man.py b/docs/dbk2man.py
index 598e35be43ab25ab4bc747888209dae68a3a5437..4e12e5b3f4e446581a28badf92ee2422421a2393 100755 (executable)
--- a/docs/dbk2man.py
+++ b/docs/dbk2man.py
@@ -19,11 +19,11 @@ def parse_docbook(filename):
     tree = ET.parse(filename)
     return tree.getroot()
 
-def dbk2man(filename, subdirectory = "."):
+def dbk2man(filename, subdirectory = ".", make = "man"):
     root = parse_docbook(filename)
-    return docbook2man(root, subdirectory)
+    return docbook2man(root, subdirectory, make = make)
 
-def docbook2man(root, subdirectory = "."):
+def docbook2man(root, subdirectory = ".", make = "man"):
     if root.tag != "reference":
         logg.warning("no <reference> found, not a docbook file?")
         logg.warning("found <%s> instead", root.tag)
@@ -259,11 +259,18 @@ def writefile(filename, manpagetext):
 if __name__ == "__main__":
     from optparse import OptionParser
     _o = OptionParser("%prog [options] docbookfiles...")
-    _o.add_option("-d","--into", metavar="DIR", default=".",
+    _o.add_option("-o","--into", metavar="DIR", default=".",
         help="specify base directory for output [%default]")
+    _o.add_option("-t","--make", metavar="DIR", default="man",
+        help="make 'man'/'html' output pages [%default]")
     _o.add_option("-v","--verbose", action="count", default=0,
         help="increase logging level [%default]")
     opt, args = _o.parse_args()
     logging.basicConfig(level = max(0, logging.WARNING - 10 * opt.verbose))
+    # ensure commandline is compatible with "xmlto -o DIR TYPE INPUTFILE"
+    make = opt.make
+    if args and args[0] in ("man", "html"):
+       make = args[0]
+       args = args[1:]
     for arg in args:
-        dbk2man(arg, opt.into)
+        dbk2man(arg, opt.into, make)