[Pkg-ocaml-maint-commits] r4200 - in /trunk/packages/ocaml/trunk/debian/cdbs: ocaml-vars.mk ocaml.mk

[zack at users.alioth.debian.org]

Author: zack
Date: Mon Aug 27 13:18:18 2007
New Revision: 4200

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4200
Log:
- flags specific for the backend html/man
- preliminary support for manpage generation

Modified:
    trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk
    trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk

Modified: trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk?rev=4200&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk (original)
+++ trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk Mon Aug 27 13:18:18 2007
@@ -88,9 +88,17 @@
 OCAML_OCAMLDOC_PACKAGES =
 #OCAML_OCAMLDOC_PACKAGES = $(OCAML_LIBDEV_PACKAGES)	# more "aggressive" default
 
-# flags to be passed to ocamldoc (in addition to -html and -d DESTDIR).
+# generic (i.e. non backend specific) flags to be passed to ocamldoc
 # For debian/rules writers
 OCAML_OCAMLDOC_FLAGS = -stars -m A
 
+# html-specific flags to be passed to ocamldoc (in addition to -html -d DESTDIR)
+# For debian/rules writers
+OCAML_OCAMLDOC_FLAGS_HTML =
+
+# man-specific flags to be passed to ocamldoc (in addition to -man -d DESTDIR)
+# For debian/rules writers
+OCAML_OCAMLDOC_FLAGS_MAN = -man-mini
+
 endif
 

Modified: trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk?rev=4200&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk (original)
+++ trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk Mon Aug 27 13:18:18 2007
@@ -48,10 +48,19 @@
 		echo 'mkdir -p debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/html/api' ; \
 		mkdir -p debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/html/api ; \
 		echo 'invoking ocamldoc on debian/$(cdbs_curpkg)$(OCAML_STDLIB_DIR)/ ...' ; \
+		# generate HTML documentation
 		find debian/$(cdbs_curpkg)$(OCAML_STDLIB_DIR)/ \
 			-type f -name '*.mli' -or -name '*.ml' \
-		| xargs ocamldoc $(OCAML_OCAMLDOC_FLAGS) -html \
+		| xargs ocamldoc $(OCAML_OCAMLDOC_FLAGS) \
+			-html $(OCAML_OCAMLDOC_FLAGS_HTML) \
 			-d debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/html/api ; \
+		## generate manpages
+		## XXX dumb: find for *.ml{i,} is executed twice
+		#find debian/$(cdbs_curpkg)$(OCAML_STDLIB_DIR)/ \
+		#	-type f -name '*.mli' -or -name '*.ml' \
+		#| xargs ocamldoc $(OCAML_OCAMLDOC_FLAGS) \
+		#	-man $(OCAML_OCAMLDOC_FLAGS_MAN) \
+		#	-d debian/$(cdbs_curpkg)/usr/share/man/... # TODO ; \
 	fi
 
 # generate .in files counterpars before building, substituting @OCamlABI@