Enable cduce.

[goaljobs-goals.git] / fedora_ocaml_rebuild.ml

diff --git a/fedora_ocaml_rebuild.ml b/fedora_ocaml_rebuild.ml
index 717572e..c167834 100644 (file)
--- a/fedora_ocaml_rebuild.ml
+++ b/fedora_ocaml_rebuild.ml
@@ -23,14 +23,12 @@ 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-omake";                        (* build failure (warnings) *)
   "ocaml-pa-do";                        (* build failure, complex *)
   "ocaml-lwt";                          (* build failure on 4.02.0 *)
   "ocaml-preludeml";                    (* build failure *)
-  "cduce";                              (* camlp4-related failure, discussed upstream *)
   "frama-c";                            (* build failure *)
+  "gappalib-coq";                       (* build failure in configure script *)
 ]
 let blocked pkg = List.mem pkg blocked
 
@@ -41,7 +39,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
@@ -50,8 +47,9 @@ 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 *) ]
 
 (* Dependencies of each package.  (pkg, [deps ...]) *)
 let pkg_deps = dependencies branch source_packages
@@ -69,6 +67,30 @@ let source_packages =
   in
   List.filter (fun pkg -> not (is_blocked pkg)) source_packages
 
+(* Short the dependencies lists so that the build order is stable
+ * each time it runs.
+ *)
+let pkg_deps =
+  List.map (fun (pkg, deps) -> pkg, List.sort compare deps) pkg_deps
+
+(* Sort the source packages so that the packages with the largest
+ * number of reverse dependencies [other packages that depend on it]
+ * appear earlier in the list, on the basis that building these
+ * packages first has the greatest advantage.
+ *)
+let source_packages =
+  let rdeps pkg =
+    Utils.filter_map (
+      fun (rdep, deps) -> if List.mem pkg deps then Some rdep else None
+    ) pkg_deps
+  in
+  let cmp p1 p2 =
+    let r1 = rdeps p1 and r2 = rdeps p2 in
+    let n1 = List.length r1 and n2 = List.length r2 in
+    if n1 <> n2 then compare n2 n1 else compare p1 p2
+  in
+  List.sort cmp source_packages
+
 let () =
   printf "final list of source packages = %s\n%!"
     (String.concat " " source_packages)
@@ -80,9 +102,17 @@ let install_build_dependencies pkg =
   sh "sudo yum-builddep -y --disablerepo=\\* --enablerepo=%s %s"
     (quote yum_repo) (fedora_specfile pkg branch)
 
+(* Unset MAKEFLAGS so it doesn't affect local builds. *)
+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 =