[Pkg-ocaml-maint-commits] [SCM] why packaging branch, master, updated. debian/2.18.dfsg-3-5-g0c7bf67

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit d49599008555987a301c676ffc9c917026ed05b8
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Tue May 12 22:22:49 2009 +0200

    Do not rely on jc.cm{a,xa} anymore.
    
    This package was created as it was a dependency of frama-c.
    frama-c uses in its makefile/configure jc.cm{o,x}.
    Maintaining patches on both sides doesn't make sense.
    
    Now, jessie_lib.dpatch is useful only to put jc_ast.ml and jc_env.ml
    in the correct order when linking. Note that this requires (in the
    debian/rules) to move jc_ast.mli to jc_ast.ml and jc_env.mli to
    jc_env.ml. It's not mandatory but it's the simpliest fix I've found.

diff --git a/debian/META.in b/debian/META.in
index 7def244..54335ed 100644
--- a/debian/META.in
+++ b/debian/META.in
@@ -2,5 +2,5 @@ name="jessie"
 version="@VERSION@"
 description="This is the jessie library from Why plateform"
 requires=""
-archive(byte)="jc.cma"
-archive(native)="jc.cmxa"
+archive(byte)="jc.cmo"
+archive(native)="jc.cmx"
diff --git a/debian/libjessie-ocaml-dev.install.in b/debian/libjessie-ocaml-dev.install.in
index 895dfd6..e488b74 100644
--- a/debian/libjessie-ocaml-dev.install.in
+++ b/debian/libjessie-ocaml-dev.install.in
@@ -1,6 +1,5 @@
-jc/jc.cm*a @OCamlStdlibDir@/jessie/
 jc/jc.cmo @OCamlStdlibDir@/jessie/
 jc/jc.cmi @OCamlStdlibDir@/jessie/
-OPT: jc/jc.a @OCamlStdlibDir@/jessie/
+OPT: jc/jc.o @OCamlStdlibDir@/jessie/
 OPT: jc/jc.cmx @OCamlStdlibDir@/jessie/
 debian/META @OCamlStdlibDir@/jessie/
diff --git a/debian/patches/jessie_lib.dpatch b/debian/patches/jessie_lib.dpatch
index 500fd26..5e7cd2e 100755
--- a/debian/patches/jessie_lib.dpatch
+++ b/debian/patches/jessie_lib.dpatch
@@ -1,24 +1,12 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## jessie_lib.dpatch by  <dogguy at pps.jussieu.fr>
 ##
-## DP: Install jessie library jc.{cma,a,cmxa,cmi} : build jc.{cma,cmxa,a} and install jc.cmi
+## DP: Make jc_ast.ml and jc_env.ml fit correctly in the pack
 
 @DPATCH@
 diff -urNad why~/Makefile.in why/Makefile.in
---- why~/Makefile.in	2009-04-07 11:16:31.000000000 +0200
-+++ why/Makefile.in	2009-05-12 10:41:37.000000000 +0200
-@@ -146,9 +146,9 @@
-       $(SIMPLIFY2WHY) $(WHYSTAT) $(TOOLSTAT)
- 
- ifeq ($(OCAMLBEST),opt)
--JCLIB=jc/jc.cmo jc/jc.cmx
-+JCLIB=jc/jc.cma jc/jc.cmi jc/jc.cmo jc/jc.cmx jc/jc.cmxa jc/jc.a
- else
--JCLIB=jc/jc.cmo
-+JCLIB=jc/jc.cma jc/jc.cmi jc/jc.cmo
- endif
- 
- all: $(BINARY) $(WHYCONFIG) check $(CADUCEUS) $(JESSIE) $(KRAKATOA) coq- at COQ@ pvs- at PVS@ $(TOOLS) gwhy- at LABLGTK2@ $(JCLIB) $(REGTEST)
+--- why~/Makefile.in	2009-05-08 16:00:45.000000000 +0200
++++ why/Makefile.in	2009-05-12 22:13:18.000000000 +0200
 @@ -269,15 +269,14 @@
  
  # jessie
@@ -38,16 +26,3 @@ diff -urNad why~/Makefile.in why/Makefile.in
  
  JCCMO = src/version.cmo \
  	@ATPCMO@ $(JCCMO_EXPORT) \
-@@ -311,6 +310,12 @@
- jc/jc.cmx: $(JCCMX_EXPORT)
- 	$(OCAMLOPT) $(OFLAGS) -pack -o $@ $^
- 
-+jc/jc.cma: jc/jc.cmo
-+	$(OCAMLC) $(BFLAGS) -a -o $@ $^
-+
-+jc/jc.cmxa: jc/jc.cmx
-+	$(OCAMLOPT) $(OFLAGS) -a -o $@ $^
-+
- ppc: jc/jc.cmi jc/jc.cmo jc/jc.cmx
- 
- bin/jessie.opt: $(JCCMX)

-- 
why packaging