update top packages

Makefile

@@ -1,10 +1,11 @@
 PROMOTE=$(if $(shell ocamlc -version |grep '4\.0[012]\.[0-9][0-9]*'), \
 	      --ignore-promoted-rules, )
+PACKAGES=containers,containers-data,containers-thread
 
 all: build test
 
 build:
-	dune build $(PROMOTE) @install
+	dune build $(PROMOTE) @install -p $(PACKAGES)
 
 test: build
 	dune runtest --no-buffer --force

src/data/dune

@@ -1,7 +1,7 @@
 
 (library
   (name containers_data)
-  (public_name containers.data)
+  (public_name containers-data)
   (wrapped false)
   (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string -open CCShims_)
   (ocamlopt_flags :standard (:include ../flambda.flags))

src/data/top/containers_data_top.ml

@@ -0,0 +1,27 @@
+
+(* This file is free software, part of containers. See file "license" for more details. *)
+
+type 'a printer = Format.formatter -> 'a -> unit
+
+let eval_exn str =
+  let lexbuf = Lexing.from_string str in
+  let phrase = !Toploop.parse_toplevel_phrase lexbuf in
+  Toploop.execute_phrase false Format.err_formatter phrase
+
+let install_printer s =
+  try
+    ignore (eval_exn ("#install_printer " ^ s ^ " ;; "))
+  with _ ->
+    Printexc.print_backtrace stderr;
+    ()
+let install_printers = List.iter install_printer
+
+let () =
+  install_printers
+    [ "CCBV.pp";
+      "CCDeque.pp";
+      "CCFQueue.pp";
+      "CCFun_vec.pp";
+      "CCIntMap.pp";
+      "CCPersistentArray.pp";
+    ]

src/data/top/dune

@@ -0,0 +1,7 @@
+
+(library
+  (name containers_data_top)
+  (public_name containers-data.top)
+  (wrapped false)
+  (flags :standard -warn-error -a+8 -safe-string)
+  (libraries compiler-libs.common containers containers-data))

src/top/containers_top.ml

@@ -17,11 +17,6 @@ let install_printers = List.iter install_printer
 
 let () =
   install_printers
-    [ "CCHashtbl.pp"
+    [ "CCHashtbl.pp";
-    ; "CCBV.pp"
+      "CCSexp.pp";
-    ; "CCDeque.pp"
-    ; "CCFQueue.pp"
-    ; "CCIntMap.pp"
-    ; "CCPersistentArray.pp"
-    ; "CCSexp.pp"
     ]

src/top/dune

@@ -6,6 +6,4 @@
   (wrapped false)
   (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string)
   (ocamlopt_flags :standard (:include ../flambda.flags))
-  (libraries compiler-libs.common containers containers.data
+  (libraries compiler-libs.common containers containers.unix containers.sexp))
-             containers.unix containers.sexp containers.iter)
-  )