X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fedora_ocaml_rebuild.ml;h=c167834c2924d0ae120769c8c89bb71b41b35806;hb=e1faf14f3230840b4c60c317ea974e7c84eb340b;hp=a22d84bc40cfeddc90393627ebc7cbe950400714;hpb=6117f2b37adc6f6ffefb345acc55956418bfeebe;p=goaljobs-goals.git

diff --git a/fedora_ocaml_rebuild.ml b/fedora_ocaml_rebuild.ml
index a22d84b..c167834 100644
--- a/fedora_ocaml_rebuild.ml
+++ b/fedora_ocaml_rebuild.ml
@@ -14,7 +14,7 @@ let koji_target = "rawhide"
 (* The name of the rebuild, and also the magic substring that must
  * appear in the %changelog when the package has been rebuilt.
  *)
-let rebuild_name = "OCaml 4.02.0 beta"
+let rebuild_name = "ocaml-4.02.0-0.8.git10e45753.fc22"
 
 (* Local repository that contains build dependencies. *)
 let yum_repo = "koji-rawhide"
@@ -23,17 +23,12 @@ let yum_repo = "koji-rawhide"
  * dependent packages.
  *)
 let blocked = [
-  "ocaml-bitstring";               (* needs upstream fix for 4.02.0 *)
-
-  (* ocaml-labltk needs to be packaged.  Unfortunately because there
-   * is no spec file, ocaml-labltk doesn't appear in the list of
-   * source packages, and so is filtered out of all the dependency
-   * checks as if it were a non-OCaml package.  Therefore we currently
-   * also have to list all packages that depend on it.
-   *)
-  "ocaml-labltk"; (* BRed by: *) "ocaml-lablgl"; "ocaml-ocamlnet"; "planets";
-
-  "ocaml-camlp5";                       (* not updated for 4.02.0 *)
+  "ocaml-omake";                        (* build failure (warnings) *)
+  "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 *)
 ]
 let blocked pkg = List.mem pkg blocked
 
@@ -41,10 +36,10 @@ let blocked pkg = List.mem pkg blocked
 let ignored = [
   "ocaml-srpm-macros";             (* don't need to build this *)
   "ocaml";                         (* rebuilt by hand *)
-  "ocaml-findlib";                 (* rebuilt by hand *)
-  "ocaml-lwt"; "ocaml-react";      (* loganjerry is handling *)
-  "ocaml-camlidl";                 (* rebuilt by orionp *)
   "whenjobs";                      (* obsolete *)
+  "libguestfs";                    (* rebuilt by hand *)
+  "graphviz";                      (* rebuilt by hand *)
+  "plplot";                        (* already done *)
 ]
 let ignored pkg = List.mem pkg ignored
 
@@ -52,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
@@ -71,13 +67,52 @@ 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)
 
+(* We could make this a goal, but it's cheap enough to run it unconditionally. *)
+let install_build_dependencies pkg =
+  sh "sudo yum clean all --disablerepo=\\* --enablerepo=%s"
+    (quote yum_repo);
+  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 =
@@ -184,14 +219,13 @@ and local_build_succeeded pkg =
 
   target (memory_exists key);
 
-  (* Do a local test build to ensure the Koji build will work. *)
+  install_build_dependencies pkg;
+
+ (* Do a local test build to ensure the Koji build will work. *)
   sh "
     cd %s
-    sudo yum-builddep -y --disablerepo=\\* --enablerepo=%s %s
-    fedpkg local
-  " (fedora_repo pkg branch)
-    (quote yum_repo)
-    (fedora_specfile pkg branch);
+     fedpkg local
+  " (fedora_repo pkg branch);
 
   memory_set key "1"
 
@@ -211,8 +245,7 @@ and specfile_updated pkg =
       git pull --rebase
     " repodir;
 
-  sh "sudo yum-builddep -y --disablerepo=\\* --enablerepo=%s %s"
-    (quote yum_repo) specfile;
+  install_build_dependencies pkg;
 
   (* For rationale behind always bumping the spec file, see comment
    * in 'fedora.ml'.