[Pkg-ocaml-maint-commits] [SCM] ocaml-batteries packaging branch, build, updated. upstream/0.20081011-23-ga0ee741
Stefano Zacchiroli
zack at upsilon.cc
Mon Oct 13 08:52:15 UTC 2008
The following commit has been merged in the build branch:
commit a0ee7419ecebc7747e493821e111f29356171110
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date: Mon Oct 13 09:54:25 2008 +0200
releasing 0.20081011-1
diff --git a/debian/patches/features/flexi-build.diff b/debian/patches/features/flexi-build.diff
new file mode 100644
index 0000000..fac6d6e
--- /dev/null
+++ b/debian/patches/features/flexi-build.diff
@@ -0,0 +1,138 @@
+From: Stefano Zacchiroli <zack at upsilon.cc>
+Subject: [PATCH] features/flexi-build
+
+More flexible Makefile / build process
+
+- enable passing flags to ocamlbuild
+- build without requiring native code compiler
+- enable installing to non-standard path
+
+Signed-off-by: Stefano Zacchiroli <zack at upsilon.cc>
+
+---
+ Makefile | 77 +++++++++++++++++++++++++++++++++++++++++++------------------
+ 1 files changed, 54 insertions(+), 23 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index a276df3..13b1da3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -21,6 +21,21 @@
+ PACKS=$(shell find src -name "*mlpack")
+ GENERATED_MLI=$(patsubst %.mlpack, %.mli, $(PACKS))
+
++# findlib destdir, if you need to install in non-standard places invoke make
++# as: "make install DESTDIR=/some/where/"
++DESTDIR =
++
++# ocamlbuild flags
++OBFLAGS =
++
++ifeq ($(DESTDIR),)
++DESTDIR_FLAGS =
++else
++DESTDIR_FLAGS = -destdir $(DESTDIR)
++install: install-mkdir
++install-mkdir:
++ test -d $(DESTDIR) || mkdir -p $(DESTDIR)
++endif
+
+ test:
+ $(shell echo $(GENERATED_MLI))
+@@ -31,23 +46,23 @@ all: byte syntax
+ reinstall: byte syntax opt uninstall install
+
+ _build/build/odoc_generator_batlib.cmo: build/odoc_generator_batlib.ml
+- ocamlbuild odoc_generator_batlib.cmo
++ ocamlbuild $(OBFLAGS) odoc_generator_batlib.cmo
+
+
+ byte:
+- ocamlbuild src/main/threads/batteries.cma &&\
+- ocamlbuild src/main/nothreads/batteries.cma
++ ocamlbuild -byte-plugin $(OBFLAGS) src/main/threads/batteries.cma
++ ocamlbuild -byte-plugin $(OBFLAGS) src/main/nothreads/batteries.cma
+
+ opt:
+- ocamlbuild src/main/threads/batteries.cmxa &&\
+- ocamlbuild src/main/nothreads/batteries.cmxa
++ ocamlbuild $(OBFLAGS) src/main/threads/batteries.cmxa
++ ocamlbuild $(OBFLAGS) src/main/nothreads/batteries.cmxa
+
+ syntax:
+- ocamlbuild src/syntax/pa_openin/pa_openin.cmo &&\
+- ocamlbuild src/syntax/pa_openin/pa_openin_r.cmo &&\
+- ocamlbuild src/syntax/pa_where/pa_where.cmo &&\
+- ocamlbuild src/syntax/pa_batteries/pa_batteries.cmo &&\
+- ocamlbuild src/syntax/pa_mainfun/pa_mainfun.cmo
++ ocamlbuild $(OBFLAGS) src/syntax/pa_openin/pa_openin.cmo
++ ocamlbuild $(OBFLAGS) src/syntax/pa_openin/pa_openin_r.cmo
++ ocamlbuild $(OBFLAGS) src/syntax/pa_where/pa_where.cmo
++ ocamlbuild $(OBFLAGS) src/syntax/pa_batteries/pa_batteries.cmo
++ ocamlbuild $(OBFLAGS) src/syntax/pa_mainfun/pa_mainfun.cmo
+
+ batteries.mllib:
+ # echo $(foreach i, $(basename $(notdir $(shell find src/ -name "*.ml" -o -name "*.mlpack"))), $(shell ocaml build/tools.ml --capit $i)) > batteries.mllib &&\
+@@ -70,19 +85,35 @@ batteries.mllib:
+ # cp batteries.mllib src/main/nothreads
+
+ install: syntax
+- ocamlfind install batteries build/META _build/src/syntax/pa_openin/pa_openin.cmo _build/src/syntax/pa_openin/pa_openin_r.cmo _build/src/syntax/pa_where/pa_where.cmo _build/src/syntax/pa_batteries/pa_batteries.cmo _build/src/syntax/pa_mainfun/pa_mainfun.cmo &&\
+- ocamlfind install batteries_threads build/threaded/META _build/src/main/threads/batteries.cmi -optional _build/src/main/threads/batteries.cma _build/src/main/threads/batteries.cmxa _build/src/main/threads/batteries.a &&\
+- ocamlfind install batteries_nothreads build/nothreads/META _build/src/main/nothreads/batteries.cmi -optional _build/src/main/nothreads/batteries.cma _build/src/main/nothreads/batteries.cmxa _build/src/main/nothreads/batteries.a
++ ocamlfind install $(DESTDIR_FLAGS) batteries \
++ build/META \
++ _build/src/syntax/pa_openin/pa_openin.cmo \
++ _build/src/syntax/pa_openin/pa_openin_r.cmo \
++ _build/src/syntax/pa_where/pa_where.cmo \
++ _build/src/syntax/pa_batteries/pa_batteries.cmo \
++ _build/src/syntax/pa_mainfun/pa_mainfun.cmo
++ ocamlfind install $(DESTDIR_FLAGS) batteries_threads \
++ build/threaded/META \
++ _build/src/main/threads/batteries.cmi \
++ -optional _build/src/main/threads/batteries.cma \
++ _build/src/main/threads/batteries.cmxa \
++ _build/src/main/threads/batteries.a
++ ocamlfind install $(DESTDIR_FLAGS) batteries_nothreads \
++ build/nothreads/META \
++ _build/src/main/nothreads/batteries.cmi \
++ -optional _build/src/main/nothreads/batteries.cma \
++ _build/src/main/nothreads/batteries.cmxa \
++ _build/src/main/nothreads/batteries.a
+
+ uninstall:
+- ocamlfind remove batteries &&\
+- ocamlfind remove batteries_threads &&\
+- ocamlfind remove batteries_nothreads
++ ocamlfind remove $(DESTDIR_FLAGS) batteries
++ ocamlfind remove $(DESTDIR_FLAGS) batteries_threads
++ ocamlfind remove $(DESTDIR_FLAGS) batteries_nothreads
+
+ doc: byte doc/api.odocl
+- \rm -Rf doc/batteries/html/api &&\
+- ocamlbuild -I src/main/threads doc/api.docdir/index.html &&\
+- rm api.docdir &&\
++ rm -Rf doc/batteries/html/api
++ ocamlbuild $(OBFLAGS) -I src/main/threads doc/api.docdir/index.html
++ rm api.docdir
+ mv _build/doc/api.docdir/ doc/batteries/html/api
+
+ doc/api.odocl:
+@@ -92,11 +123,11 @@ examples:
+ @echo Note: to build the examples, you must first have installed Batteries &&\
+ echo If you haven\'t installed Batteries yet, please use make byte opt install &&\
+ cd examples &&\
+- ocamlbuild examples.otarget
++ ocamlbuild $(OBFLAGS) examples.otarget
+
+ clean:
+- ocamlbuild -clean &&\
+- \rm -f `find . -name "*~" -o -name "*#" -o -name "*odoc"` &&\
+- \rm -f META doc/api.odocl doc/batteries/html/api/*
++ ocamlbuild $(OBFLAGS) -clean
++ rm -f `find . -name "*~" -o -name "*#" -o -name "*odoc"`
++ rm -f META doc/api.odocl doc/batteries/html/api/*
+
+ .PHONY: doc/api.odocl batteries.mllib examples
+--
+tg: (7671267..) features/flexi-build (depends on: upstream)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b498b71
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+features/flexi-build.diff -p1
--
ocaml-batteries packaging
More information about the Pkg-ocaml-maint-commits
mailing list