This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository atdgen.
commit 5ba2ecc9ffc9f8bd178e131527342606a1e7f44b
Author: Stephane Glondu <st...@glondu.net>
Date: Sat Feb 1 17:48:56 2014 +0100
Update patch
The "fix test" part needs more work; we remove it.
---
...files-for-dangling-cmi-s-and-fix-test-com.patch | 108 ---------------------
.../0001-Install-ml-files-for-dangling-cmi-s.patch | 40 ++++++++
debian/patches/series | 2 +-
3 files changed, 41 insertions(+), 109 deletions(-)
diff --git
a/debian/patches/0001-Install-ml-files-for-dangling-cmi-s-and-fix-test-com.patch
b/debian/patches/0001-Install-ml-files-for-dangling-cmi-s-and-fix-test-com.patch
deleted file mode 100644
index 18036bb..0000000
---
a/debian/patches/0001-Install-ml-files-for-dangling-cmi-s-and-fix-test-com.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From: Hendrik Tews <hend...@askra.de>
-Date: Sat, 1 Feb 2014 16:55:27 +0100
-Subject: Install ml files for dangling cmi's and fix test compilation
-
----
- Makefile | 66 +++++++++++++++++++++++++++++++++++-----------------------------
- 1 file changed, 36 insertions(+), 30 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 4c6c30a..1bbba66 100644
---- a/Makefile
-+++ b/Makefile
-@@ -98,8 +98,14 @@ install: META
- test ! -f atdgen || cp atdgen $(BINDIR)/
- test ! -f atdgen.exe || cp atdgen.exe $(BINDIR)/
- ocamlfind install atdgen META \
-- $(MLI) $(CMI) $(CMO) $(CMX) $(O) \
-- atdgen.cma atdgen.a atdgen.cmxa
-+ $$(ls $(MLI) $(CMI) $(CMO) $(CMX) $(O) \
-+ atdgen.cma atdgen.a atdgen.cmxa ) \
-+ ag_biniou.ml ag_doc_lexer.ml ag_doc_lexer.mll ag_error.ml \
-+ ag_indent.ml ag_json.ml ag_mapping.ml ag_ob_emit.ml \
-+ ag_ob_mapping.ml ag_ob_run.ml ag_ob_spe.ml ag_ocaml.ml \
-+ ag_oj_emit.ml ag_oj_mapping.ml ag_oj_run.ml ag_ov_emit.ml \
-+ ag_ov_mapping.ml ag_ov_run.ml ag_ox_emit.ml ag_validate.ml \
-+ ag_xb_emit.ml ag_version.ml
-
- uninstall:
- test ! -f $(BINDIR)/atdgen.run || rm $(BINDIR)/atdgen.run
-@@ -163,7 +169,7 @@ atdgen$(EXE): dep $(CMI) $(CMX) ag_main.ml
-
-
- .PHONY: doc
--doc: odoc/index.html atdgen$(EXE)
-+doc: odoc/index.html
- cd manual; $(MAKE)
-
- odoc/index.html: $(CMI)
-@@ -175,7 +181,7 @@ odoc/index.html: $(CMI)
- # Some testing
-
- .PHONY: test really-test
--test: opt
-+test:
- OCAMLPATH=..:$$OCAMLPATH $(MAKE) really-test
-
- really-test:
-@@ -192,33 +198,33 @@ really-test:
- ./atdgen test4.atd
- ./atdgen -json test4.atd -o test4j
- ./atdgen -validate -extend Test test.atd -o testv
-- ocamlfind ocamlopt -c -g test_lib.ml
-- ocamlfind ocamlc -c -g test.mli -package atdgen
-- ocamlfind ocamlopt -c -g test.ml -package atdgen
-- ocamlfind ocamlc -c -g test2.mli -package atdgen
-- ocamlfind ocamlopt -c -g test2.ml -package atdgen
-- ocamlfind ocamlc -c -g test3b.mli -package atdgen
-- ocamlfind ocamlopt -c -g test3b.ml -package atdgen
-- ocamlfind ocamlc -c -g test3j.mli -package atdgen
-- ocamlfind ocamlopt -c -g test3j.ml -package atdgen
-- ocamlfind ocamlc -c -g test4.mli -package atdgen
-- ocamlfind ocamlopt -c -g test4.ml -package atdgen
-- ocamlfind ocamlc -c -g testj.mli -package atdgen
-- ocamlfind ocamlopt -c -g testj.ml -package atdgen
-- ocamlfind ocamlc -c -g testjstd.mli -package atdgen
-- ocamlfind ocamlopt -c -g testjstd.ml -package atdgen
-- ocamlfind ocamlc -c -g test2j.mli -package atdgen
-- ocamlfind ocamlopt -c -g test2j.ml -package atdgen
-- ocamlfind ocamlc -c -g test4j.mli -package atdgen
-- ocamlfind ocamlopt -c -g test4j.ml -package atdgen
-- ocamlfind ocamlc -c -g testv.mli -package atdgen
-- ocamlfind ocamlopt -c -g testv.ml -package atdgen
-- ocamlfind ocamlopt -c -g test_atdgen_main.ml -package atdgen
-- ocamlfind ocamlopt -o test_atdgen$(EXE) -g -linkpkg -package atdgen \
-- test_lib.cmx test.cmx test2.cmx testj.cmx testjstd.cmx \
-- test2j.cmx test3b.cmx test3j.cmx testv.cmx test_atdgen_main.cmx
-+ ocamlfind $(OCAMLOPT) -c -g test_lib.ml
-+ ocamlfind ocamlc -c -g test.mli -package atd,yojson
-+ ocamlfind $(OCAMLOPT) -c -g test.ml -package atd,yojson
-+ ocamlfind ocamlc -c -g test2.mli -package atd,yojson
-+ ocamlfind $(OCAMLOPT) -c -g test2.ml -package atd,yojson
-+ ocamlfind ocamlc -c -g test3b.mli -package atd,yojson
-+ ocamlfind $(OCAMLOPT) -c -g test3b.ml -package atd,yojson
-+ ocamlfind ocamlc -c -g test3j.mli -package atd,yojson
-+ ocamlfind $(OCAMLOPT) -c -g test3j.ml -package atd,yojson
-+ ocamlfind ocamlc -c -g test4.mli -package atd,yojson
-+ ocamlfind $(OCAMLOPT) -c -g test4.ml -package atd,yojson
-+ ocamlfind ocamlc -c -g testj.mli -package atd,yojson
-+ ocamlfind $(OCAMLOPT) -c -g testj.ml -package atd,yojson
-+ ocamlfind ocamlc -c -g testjstd.mli -package atd,yojson
-+ ocamlfind $(OCAMLOPT) -c -g testjstd.ml -package atd,yojson
-+ ocamlfind ocamlc -c -g test2j.mli -package atd,yojson
-+ ocamlfind $(OCAMLOPT) -c -g test2j.ml -package atd,yojson
-+ ocamlfind ocamlc -c -g test4j.mli -package atd,yojson
-+ ocamlfind $(OCAMLOPT) -c -g test4j.ml -package atd,yojson
-+ ocamlfind ocamlc -c -g testv.mli -package atd,yojson
-+ ocamlfind $(OCAMLOPT) -c -g testv.ml -package atd,yojson
-+ ocamlfind $(OCAMLOPT) -c -g test_atdgen_main.ml -package atd,yojson
-+ ocamlfind $(OCAMLOPT) -o test_atdgen$(EXE) -g -linkpkg -package
atd,yojson $(LIBATDGEN) \
-+ test_lib.$(OBJEXT) test.$(OBJEXT) test2.$(OBJEXT)
testj.$(OBJEXT) testjstd.$(OBJEXT) \
-+ test2j.$(OBJEXT) test3b.$(OBJEXT) test3j.$(OBJEXT)
testv.$(OBJEXT) test_atdgen_main.$(OBJEXT)
- mkdir -p testdoc
-- ocamlfind ocamldoc -html -d testdoc -package atdgen \
-+ ocamlfind ocamldoc -html -d testdoc -package atd,yojson \
- test.mli test2.mli testj.mli test2j.mli test3b.mli \
- test3j.mli test4.mli test4j.mli testv.mli
- ./test_atdgen
---
diff --git a/debian/patches/0001-Install-ml-files-for-dangling-cmi-s.patch
b/debian/patches/0001-Install-ml-files-for-dangling-cmi-s.patch
new file mode 100644
index 0000000..5fadf13
--- /dev/null
+++ b/debian/patches/0001-Install-ml-files-for-dangling-cmi-s.patch
@@ -0,0 +1,40 @@
+From: Hendrik Tews <hend...@askra.de>
+Date: Sat, 1 Feb 2014 16:55:27 +0100
+Subject: Install ml files for dangling cmi's
+
+Signed-off-by: Stephane Glondu <st...@glondu.net>
+---
+ Makefile | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index c49b299..9b20997 100644
+--- a/Makefile
++++ b/Makefile
+@@ -104,8 +104,14 @@ install: META
+ test ! -f atdgen || cp atdgen $(BINDIR)/
+ test ! -f atdgen.exe || cp atdgen.exe $(BINDIR)/
+ ocamlfind install atdgen META \
+- $(MLI) $(CMI) $(CMO) $(CMX) $(CMXS) $(O) \
+- atdgen.cma atdgen.a atdgen.cmxa
++ $(wildcard $(MLI) $(CMI) $(CMO) $(CMX) $(CMXS) $(O) \
++ atdgen.cma atdgen.a atdgen.cmxa) \
++ ag_biniou.ml ag_doc_lexer.ml ag_doc_lexer.mll ag_error.ml \
++ ag_indent.ml ag_json.ml ag_mapping.ml ag_ob_emit.ml \
++ ag_ob_mapping.ml ag_ob_run.ml ag_ob_spe.ml ag_ocaml.ml \
++ ag_oj_emit.ml ag_oj_mapping.ml ag_oj_run.ml ag_ov_emit.ml \
++ ag_ov_mapping.ml ag_ov_run.ml ag_ox_emit.ml ag_validate.ml \
++ ag_xb_emit.ml ag_version.ml
+
+ uninstall:
+ test ! -f $(BINDIR)/atdgen.run || rm $(BINDIR)/atdgen.run
+@@ -172,7 +178,7 @@ atdgen$(EXE): dep $(CMI) $(CMX) ag_main.ml
+
+
+ .PHONY: doc
+-doc: odoc/index.html atdgen$(EXE)
++doc: odoc/index.html
+ cd manual; $(MAKE)
+
+ odoc/index.html: $(CMI)
+--
diff --git a/debian/patches/series b/debian/patches/series
index 4a9014b..776c15a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-0001-Install-ml-files-for-dangling-cmi-s-and-fix-test-com.patch
+0001-Install-ml-files-for-dangling-cmi-s.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/atdgen.git
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
