Make ocamldoc work with custom syntax within xen-api-libs.

signed-off-by: Rok Strnisa <rok.strnisa@citrix.com>

diff --git a/doc/doc.py b/doc/doc.py
index abba485a80f3d9faac8b73e86e5074aa11110b6c..d123c1d2594be1f92b1dee7bc9e3adfc8a6b6838 100644 (file)
--- a/doc/doc.py
+++ b/doc/doc.py
@@ -26,6 +26,10 @@ modules = set(sys.argv[4].split())
 includes = sys.argv[5].split()
 packs = sys.argv[6].replace(',',' ').split()
 libs = sys.argv[7].split()
+if len(sys.argv) >= 9:
+       pp = '-pp ' + sys.argv[8]
+else:
+       pp = ''
 
 libs = list(set(libs)) # remove duplicates
 packs = list(set(packs))       # remove duplicates
@@ -41,7 +45,7 @@ if len(packs) > 0:
 else:
        packages = ""
 
-doc_command = 'ocamlfind ocamldoc -v ' + packages + ' -I +threads -sort -g /myrepos/xen-api.hg/ocaml/doc/odoc_json.cma -d ' + dest + ' '
+doc_command = 'ocamlfind ocamldoc -v ' + packages + ' -I +threads -sort -g /myrepos/xen-api.hg/ocaml/doc/odoc_json.cma -d ' + dest + ' ' + pp
 
 files = []
 for m in modules:

diff --git a/mlvm/Makefile b/mlvm/Makefile
index b3bfc77f0b9d0f524b09352dfeb80039134ec7ea..0fea29baa977b2a854e278b59d8a3be938e6481d 100644 (file)
--- a/mlvm/Makefile
+++ b/mlvm/Makefile
@@ -59,8 +59,8 @@ clean :
 
 .PHONY: doc
 doc: $(INTF)
-       python ../doc/doc.py $(DOCDIR) "mlvm" "package" "$(LIBOBJS)" "." "stdext,camldm,uuid,unix" ""
-       
+       python ../doc/doc.py $(DOCDIR) "mlvm" "package" "$(LIBOBJS)" "." "stdext,camldm,uuid,unix" "" "'${PP}'"
+
 lvmconfigparser.ml : lvmconfigparser.mly
        ocamlyacc lvmconfigparser.mly
        $(OCAMLOPT) $(COMPFLAG) -c lvmconfigparser.mli