[Pkg-ocaml-maint-commits] [ocaml-atd] 04/05: Update packaging

[Stéphane Glondu]

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository ocaml-atd.

commit ce06ab6e8172469b4f0adb267256d658bbc5747c
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Aug 6 11:03:51 2014 +0200

    Update packaging
---
 debian/libatd-ocaml.install.in                     |  1 +
 ...makefile-for-byte-code-only-architectures.patch | 38 +++++++++++++++-------
 debian/rules                                       |  2 +-
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/debian/libatd-ocaml.install.in b/debian/libatd-ocaml.install.in
index 33132fb..9ddd826 100644
--- a/debian/libatd-ocaml.install.in
+++ b/debian/libatd-ocaml.install.in
@@ -1,2 +1,3 @@
 @OCamlStdlibDir@/atd/META
 @OCamlStdlibDir@/atd/atd.cma
+DYN: @OCamlStdlibDir@/atd/atd.cmxs
diff --git a/debian/patches/0001-Tweak-makefile-for-byte-code-only-architectures.patch b/debian/patches/0001-Tweak-makefile-for-byte-code-only-architectures.patch
index caa1402..ea56917 100644
--- a/debian/patches/0001-Tweak-makefile-for-byte-code-only-architectures.patch
+++ b/debian/patches/0001-Tweak-makefile-for-byte-code-only-architectures.patch
@@ -4,23 +4,30 @@ Subject: Tweak makefile for byte-code only architectures
 
 Signed-off-by: Stephane Glondu <steph at glondu.net>
 ---
- Makefile | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
+ Makefile | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 9046f02..de5ec61 100644
+index 2a587d8..4021517 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -73,7 +73,7 @@ install: META
+@@ -77,13 +77,13 @@ default: all opt
+ 
+ all: VERSION META atd.cma
+ 
+-opt: VERSION META atd.cmxa $(CMXS) atdcat$(EXE)
++opt: VERSION META atd.cmxa $(CMXS) atdcat$(EXE) unit-tests$(EXE)
+ 
+ install: META
  	test ! -f atdcat || cp atdcat $(BINDIR)/
  	test ! -f atdcat.exe || cp atdcat.exe $(BINDIR)/
  	ocamlfind install atd META \
--	 $(MLI) $(CMI) $(CMO) $(CMX) $(O) atd.cma atd.a atd.cmxa \
-+	 $(wildcard $(MLI) $(CMI) $(CMO) $(CMX) $(O) atd.cma atd.a atd.cmxa) \
+-	 $(MLI) $(CMI) $(CMO) $(CMX) $(CMXS) $(O) atd.cma atd.a atd.cmxa \
++	 $(wildcard $(MLI) $(CMI) $(CMO) $(CMX) $(CMXS) $(O) atd.cma atd.a atd.cmxa) \
           $(INSTALL_EXTRAS)
  
  uninstall:
-@@ -137,6 +137,11 @@ atdcat$(EXE): dep $(CMI) $(CMX) atdcat.ml
+@@ -150,11 +150,20 @@ atdcat$(EXE): dep $(CMI) $(CMX) atdcat.ml
  		-package "$(OCAMLPACKS)" -linkpkg \
  		$(CMX) atdcat.ml
  
@@ -29,16 +36,25 @@ index 9046f02..de5ec61 100644
 +		-package "$(OCAMLPACKS)" -linkpkg \
 +		$(CMO) atdcat.ml
 +
+ unit-tests$(EXE): dep $(CMI) $(CMX) unit_tests.ml
+ 	ocamlfind ocamlopt $(OCAMLFLAGS) -o unit-tests$(EXE) \
+ 		-package "$(OCAMLPACKS)" -linkpkg \
+ 		$(CMX) unit_tests.ml
+ 
++unit-tests.byte: dep $(CMI) $(CMO) unit_tests.ml
++	ocamlfind ocamlc $(OCAMLFLAGS) -o unit-tests$(EXE) \
++		-package "$(OCAMLPACKS)" -linkpkg \
++		$(CMO) unit_tests.ml
+ 
  .PHONY: doc
  doc: odoc/index.html atdcat$(EXE)
- 	cd manual; $(MAKE)
-@@ -148,7 +153,7 @@ odoc/index.html: $(CMI)
+@@ -167,7 +176,7 @@ odoc/index.html: $(CMI)
  		-package "$(OCAMLPACKS)" $(DOCSOURCES)
  
  .PHONY: test
--test: atdcat$(EXE) test.atd test2.atd
+-test: atdcat$(EXE) unit-tests$(EXE) test.atd test2.atd
 +test: test.atd test2.atd
+ 	./unit-tests$(EXE)
  	./atdcat test.atd > test.out
  	./atdcat test.out > test.out.out
- 	cmp test.out test.out.out
 -- 
diff --git a/debian/rules b/debian/rules
index bb1700d..98d5b6d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,7 @@ override_dh_auto_build:
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 	$(MAKE) opt
 else
-	$(MAKE) atdcat.byte
+	$(MAKE) atdcat.byte unit-tests.byte
 endif
 	$(MAKE) odoc/index.html
 	$(MAKE) -C manual html pdf

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-atd.git