removed copy of CCFormat from nunchaku backend and added containers/C…

…CFormat dependency. adjusted the nunchaku code to the containers 1.0 changes of CCFormat.

.merlin

@@ -18,3 +18,4 @@ PKG xmlm
 PKG kaputt
 PKG sexplib
 PKG result
+PKG containers

_oasis

@@ -17,6 +17,7 @@ Executable tlapm2
                 str,
                 unix,
                 sexplib,
+                containers,
                 result
 
 
@@ -46,6 +47,7 @@ Executable test
                 unix,
                 kaputt,
                 sexplib,
+                containers,
                 result
 
 Test "test-runner"

_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: f0e44f04570ded47df44744f470a0578)
+# DO NOT EDIT (digest: 3c6633ea784d731587ada5ec0efb0704)
 # Ignore VCS directories, you can use the same kind of rule outside
 # OASIS_START/STOP if you want to exclude directories that contains
 # useless stuff for the build process
@@ -15,18 +15,21 @@ true: annot, bin_annot
 "_darcs": -traverse
 "_darcs": not_hygienic
 # Executable tlapm2
+"src/tlapm.byte": pkg_containers
 "src/tlapm.byte": pkg_result
 "src/tlapm.byte": pkg_sexplib
 "src/tlapm.byte": pkg_str
 "src/tlapm.byte": pkg_unix
 "src/tlapm.byte": pkg_xmlm
 # Executable test
+"src/tests.byte": pkg_containers
 "src/tests.byte": pkg_kaputt
 "src/tests.byte": pkg_result
 "src/tests.byte": pkg_sexplib
 "src/tests.byte": pkg_str
 "src/tests.byte": pkg_unix
 "src/tests.byte": pkg_xmlm
+<src/*.ml{,i,y}>: pkg_containers
 <src/*.ml{,i,y}>: pkg_kaputt
 <src/*.ml{,i,y}>: pkg_result
 <src/*.ml{,i,y}>: pkg_sexplib
@@ -44,4 +47,5 @@ true: annot, bin_annot
 <src/sany>: include
 <src/test/*.ml{,i,y}>: pkg_kaputt
 <src/nunchaku/*.ml{,i,y}>: pkg_sexplib
+<src/nunchaku/*.ml{,i,y}>: pkg_containers
 <src/sany/*.ml{,i,y}>: pkg_xmlm

opam

@@ -2,7 +2,7 @@ opam-version: "1.2"
 name: "tlapm2"
 version: "dev"
 maintainer: "[email protected]"
-authors: ["Martin Riener" "Matthieu Lequesne"]
+authors: ["Damien Doligez" "Matthieu Lequesne" "Tomer Libal" "Martin Riener"]
 homepage: "https://github.com/tlaplus/v2-tlapm"
 bug-reports: "https://github.com/tlaplus/v2-tlapm/issues"
 dev-repo: "https://github.com/tlaplus/v2-tlapm.git"
@@ -28,6 +28,7 @@ depends: [
     "xmlm" {>= "1.2.0"}
     "sexplib"
     "result"
+    "containers" {>= "1.0"}
 ]
 depopts: [
     "kaputt" {test}

setup.ml

@@ -1,7 +1,7 @@
-(* setup.ml generated for the first time by OASIS v0.3.0 *)
+(* setup.ml generated for the first time by OASIS v0.4.8 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 61707546127f264f3558ee487b8fab5c) *)
+(* DO NOT EDIT (digest: 39fc11f742344635c7a7e4cd63b426d5) *)
 (*
    Regenerated by OASIS v0.4.8
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -7092,6 +7092,7 @@ let setup_t =
                            FindlibPackage ("str", None);
                            FindlibPackage ("unix", None);
                            FindlibPackage ("sexplib", None);
+                           FindlibPackage ("containers", None);
                            FindlibPackage ("result", None)
                         ];
                       bs_build_tools = [ExternalTool "ocamlbuild"];
@@ -7262,6 +7263,7 @@ let setup_t =
                            FindlibPackage ("unix", None);
                            FindlibPackage ("kaputt", None);
                            FindlibPackage ("sexplib", None);
+                           FindlibPackage ("containers", None);
                            FindlibPackage ("result", None)
                         ];
                       bs_build_tools = [ExternalTool "ocamlbuild"];
@@ -7449,15 +7451,15 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.8";
-     oasis_digest = Some "\024\000\131hU\200KA\150\252\184s\228.\206\131";
+     oasis_digest = Some "\t\214+C\020\156\178\007\240Kf\1621I|\163";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false
   };;
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 7461 "setup.ml"
+# 7463 "setup.ml"
 let setup_t = BaseCompat.Compat_0_4.adapt_setup_t setup_t
 open BaseCompat.Compat_0_4
 (* OASIS_STOP *)