X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fedora_ocaml_rebuild.ml;h=6967812228324aadfd12079e4a7ef228891b00e1;hb=e092d6a53db69dbde869c46e9ebd07b1d0db2783;hp=9c3cffc76e776600f024d03246982e55c737d0ef;hpb=8162d70380425801ab4e8038b8d89c20e11b8f4b;p=goaljobs-goals.git

diff --git a/fedora_ocaml_rebuild.ml b/fedora_ocaml_rebuild.ml
index 9c3cffc..6967812 100644
--- a/fedora_ocaml_rebuild.ml
+++ b/fedora_ocaml_rebuild.ml
@@ -23,13 +23,10 @@ let yum_repo = "koji-rawhide"
  * dependent packages.
  *)
 let blocked = [
-  "ocaml-mikmatch";                     (* build failure on 4.02.0 *)
-  "ocaml-omake";                        (* build failure on 4.02.0 with hevea *)
-  "ocaml-p3l";                          (* build failure on 4.02.0 -warn-error A *)
   "ocaml-pa-do";                        (* build failure, complex *)
-  "ocaml-lwt";                          (* build failure on 4.02.0 *)
-  "ocaml-preludeml";                    (* build failure *)
   "frama-c";                            (* build failure *)
+  "gappalib-coq";                       (* build failure in configure script *)
+  "ocaml-camlimages";                   (* build failure, conflicting C types in header files *)
 ]
 let blocked pkg = List.mem pkg blocked
 
@@ -40,7 +37,6 @@ let ignored = [
   "whenjobs";                      (* obsolete *)
   "libguestfs";                    (* rebuilt by hand *)
   "graphviz";                      (* rebuilt by hand *)
-  "xen";                           (* already done *)
   "plplot";                        (* already done *)
 ]
 let ignored pkg = List.mem pkg ignored
@@ -49,8 +45,11 @@ let ignored pkg = List.mem pkg ignored
 let source_packages =
   let dirs = shlines "cd %s && ls -1d ocaml*" fedora_dir in
   dirs @ [ "alt-ergo"; "apron"; "brltty"; "coccinelle"; "coq";
-           "cduce"; "frama-c"; "gappalib-coq"; "graphviz"; "hivex";
-           "js-of-ocaml"; "llvm"; "plplot"; "why3"; "xen" ]
+           "cduce"; "frama-c"; "gappalib-coq"; "graphviz"; "hevea"; "hivex";
+           "js-of-ocaml"; "llvm"; "plplot"; "virt-top"; "why3"; "xen";
+           "flocq" (* no OCaml code, but needs to be rebuilt after Coq *);
+           "guestfs-browser";
+           "virt-dmesg" ]
 
 (* Dependencies of each package.  (pkg, [deps ...]) *)
 let pkg_deps = dependencies branch source_packages
@@ -108,7 +107,12 @@ let () = Unix.putenv "MAKEFLAGS" ""
 
 (* Goal: rebuild all packages. *)
 let rec goal all () =
-  List.iter (fun pkg -> require (rebuild_started pkg)) source_packages
+  let n = List.length source_packages in
+  List.iteri (
+    fun i pkg ->
+      require (rebuild_started pkg);
+      printf "*** *** rebuilt %d/%d packages *** ***\n%!" (i+1) n
+  ) source_packages
 
 (* Goal: That 'package' has been rebuilt and exists in Koji. *)
 and rebuilt pkg =