From: Rok Strnisa <rok.strnisa@citrix.com>
Date: Thu, 17 Jun 2010 21:16:18 +0000 (+0100)
Subject: Make ocamldoc work with custom syntax within xen-api-libs.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=341fc1fdb7cc92bba84624430d4ebd2dcbd93d63;p=xcp%2Fxen-api-libs.git

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 abba485..d123c1d 100644
--- 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 b3bfc77..0fea29b 100644
--- 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