[Pkg-ocaml-maint-commits] [SCM] ocamlduce packaging branch, master, updated. debian/3.11.1.0-1-10-ga7d28e8

[Stephane Glondu]

The following commit has been merged in the master branch:
commit b5299f1497e7ebc02930f7374775643b601d3400
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Oct 14 22:47:40 2009 +0200

    Ship ocamlducedoc library files

diff --git a/debian/ocamlduce.install.in b/debian/ocamlduce.install.in
index 2d0e9dd..976a79c 100644
--- a/debian/ocamlduce.install.in
+++ b/debian/ocamlduce.install.in
@@ -3,5 +3,6 @@ usr/bin/ocamlduce*
 @OCamlStdlibDir@/ocamlduce/*.cmi
 @OCamlStdlibDir@/ocamlduce/*.cmo
 @OCamlStdlibDir@/ocamlduce/toplevellib.cma
+ at OCamlStdlibDir@/ocamlduce/ocamldoc
 OPT: @OCamlStdlibDir@/ocamlduce/*.cmxa
 OPT: @OCamlStdlibDir@/ocamlduce/*.a
diff --git a/debian/patches/0002-Build-ocamldoc-library.patch b/debian/patches/0002-Build-ocamldoc-library.patch
new file mode 100644
index 0000000..7470ccb
--- /dev/null
+++ b/debian/patches/0002-Build-ocamldoc-library.patch
@@ -0,0 +1,24 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Wed, 14 Oct 2009 22:31:00 +0200
+Subject: [PATCH] Build ocamldoc library
+
+---
+ mkocamlduce.sh |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/mkocamlduce.sh b/mkocamlduce.sh
+index 2dec75e..d7d8d32 100755
+--- a/mkocamlduce.sh
++++ b/mkocamlduce.sh
+@@ -37,6 +37,10 @@ if [ x"$HAS_NATIVE" = x"y" ]; then
+   ALL_TARGETS="$ALL_TARGETS $OCAMLDUCE_NATIVE $TOOLS_NATIVE $OCAMLDOC_NATIVE"
+ fi
+ 
++OCAML_STDLIB_DIR="$(ocamlc -where)"
++find "${OCAML_STDLIB_DIR}/ocamldoc" -type f | sed "s@^${OCAML_STDLIB_DIR}/@@" > ocamlducedoc.itarget
++ALL_TARGETS="$ALL_TARGETS ocamlducedoc.otarget"
++
+ set -x
+ 
+ if [ x"$BOOT_MODE" = x"y" ]; then
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 6499cff..3c12c50 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Build-and-install-native-code-plugin.patch
+0002-Build-ocamldoc-library.patch
diff --git a/debian/rules b/debian/rules
index acd41ab..e528666 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,7 @@ INSTALL_TARGET := installbyte $(if $(OCAML_OPT_ARCH),installopt)
 
 OCAML_SRCDIR := ocaml-$(OCAML_ABI)
 MAKE_DUCE := $(MAKE) -C $(OCAML_SRCDIR) -f Makefile.ocamlduce
+ODOC_DESTDIR := debian/tmp$(OCAML_STDLIB_DIR)/ocamlduce/ocamldoc
 
 %:
 	dh --with quilt,ocaml $@
@@ -48,6 +49,10 @@ override_dh_auto_install:
 	$(MAKE_DUCE) PREFIX=../debian/tmp/usr $(INSTALL_TARGET)
 	install -m 755 $(OCAML_SRCDIR)/_build/tools/objinfo.byte \
 	  debian/tmp/usr/bin/ocamlduceobjinfo
+	mkdir -p $(ODOC_DESTDIR)
+	find $(OCAML_STDLIB_DIR)/ocamldoc -type f -printf \
+	  '$(OCAML_SRCDIR)/_build/ocamldoc/%P\0' \
+	  | xargs -0 cp -t $(ODOC_DESTDIR)
 
 .PHONY: override_dh_auto_clean
 override_dh_auto_clean:
@@ -56,5 +61,6 @@ override_dh_auto_clean:
 .PHONY: override_dh_ocaml
 override_dh_ocaml:
 	dh_ocaml --checksum=$(OCAMLDUCE_ABI) \
-	  --runtime-map=ocamlduce:ocamlduce-base -Xtoplevellib.cma \
+	  --runtime-map=ocamlduce:ocamlduce-base \
+	  -Xtoplevellib.cma -Xocamldoc \
 	  --nodefined-map=ocamlduce:Topdirs,Toploop,Topmain,Topstart

-- 
ocamlduce packaging