X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fedora_ocaml_rebuild.ml;h=1103ebb4167f8cacf0270042b0546fad68e9275d;hb=34c9d6884ebf41cbec447d6e017d1092f830c258;hp=85bdbec65f4d9a255458363de38b46d212226704;hpb=0a426256cdda84f2c135c2f1cf76ea9d4ec30562;p=goaljobs-goals.git

diff --git a/fedora_ocaml_rebuild.ml b/fedora_ocaml_rebuild.ml
index 85bdbec..1103ebb 100644
--- a/fedora_ocaml_rebuild.ml
+++ b/fedora_ocaml_rebuild.ml
@@ -9,12 +9,18 @@ open Git
 open Fedora
 
 let branch = "master"
-let koji_target = "rawhide"
+let side_tag = Some "f31-ocaml"
+(*let side_tag = None*)
+
+let koji_target =
+  match side_tag with
+  | Some t -> t
+  | None -> "f31-build"
 
 (* 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+rc1"
+let rebuild_name = "OCaml 4.08.0 (beta 3)"
 
 (* Local repository that contains build dependencies. *)
 let yum_repo = "koji-rawhide"
@@ -23,10 +29,9 @@ let yum_repo = "koji-rawhide"
  * dependent packages.
  *)
 let blocked = [
-  "ocaml-pa-do";                        (* build failure, complex *)
-  "frama-c";                            (* build failure *)
-  "gappalib-coq";                       (* build failure in configure script *)
-  "ocaml-camlimages";                   (* build failure, conflicting C types in header files *)
+  "ocaml-camlp4";   (* not ported to 4.08 yet *)
+  "ocaml-camlp5";   (* not ported to 4.08 yet *)
+  "ocaml-zarith";   (* build failures, seemingly unrelated *)
 ]
 let blocked pkg = List.mem pkg blocked
 
@@ -34,22 +39,22 @@ let blocked pkg = List.mem pkg blocked
 let ignored = [
   "ocaml-srpm-macros";             (* don't need to build this *)
   "ocaml";                         (* rebuilt by hand *)
-  "whenjobs";                      (* obsolete *)
-  "libguestfs";                    (* rebuilt by hand *)
-  "graphviz";                      (* rebuilt by hand *)
-  "plplot";                        (* already done *)
 ]
 let ignored pkg = List.mem pkg ignored
 
 (* List of OCaml-related source package names. *)
 let source_packages =
-  let dirs = shlines "cd %s && ls -1d ocaml*" fedora_dir in
+  let dirs = shlines "
+       cd %s && \
+       for f in ocaml*; do
+         [ -f \"$f/master/$f.spec\" ] && echo \"$f\"
+       done
+  " fedora_dir in
   dirs @ [ "alt-ergo"; "apron"; "brltty"; "coccinelle"; "coq";
            "cduce"; "frama-c"; "gappalib-coq"; "graphviz"; "hevea"; "hivex";
-           "js-of-ocaml"; "llvm"; "plplot"; "virt-top"; "why3"; "xen";
+           "plplot"; "virt-top"; "why3"; "z3";
            "flocq" (* no OCaml code, but needs to be rebuilt after Coq *);
-           "guestfs-browser";
-           "virt-dmesg" ]
+           "guestfs-browser"; "libguestfs" ]
 
 (* Dependencies of each package.  (pkg, [deps ...]) *)
 let pkg_deps = dependencies branch source_packages
@@ -95,12 +100,14 @@ 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" ""
@@ -183,11 +190,15 @@ and rebuild_started pkg =
 
   (* Ignored packages are treated as if they have been rebuilt. *)
   if not (ignored pkg) then (
+(*
     (* A local test build must succeed. *)
     require (local_build_succeeded pkg);
+*)
+    (* local_build_succeeded normally does this ... *)
+    require (specfile_updated pkg);
 
     (* Rebuild the package in Koji.  Don't wait ... *)
-    koji_build ~wait:false pkg branch;
+    koji_build ~wait:false ?side_tag pkg branch;
 
     (* ... but the build doesn't appear in Koji (eg. in 'koji
      * buildinfo') until the SRPM has been built.  This can take quite
@@ -210,6 +221,7 @@ and rebuild_started pkg =
     loop ()
   )
 
+(*
 and local_build_succeeded pkg =
   (* The specfile must have been updated. *)
   require (specfile_updated pkg);
@@ -228,6 +240,7 @@ and local_build_succeeded pkg =
   " (fedora_repo pkg branch);
 
   memory_set key "1"
+*)
 
 and specfile_updated pkg =
   let repodir = fedora_repo pkg branch in
@@ -245,7 +258,9 @@ and specfile_updated pkg =
       git pull --rebase
     " repodir;
 
+(* - XXX why did we do this here?
   install_build_dependencies pkg;
+*)
 
   (* For rationale behind always bumping the spec file, see comment
    * in 'fedora.ml'.
@@ -261,16 +276,6 @@ and specfile_updated pkg =
 
   sh "
     cd %s
-    echo 'Please make further changes as required to the spec file %s.spec'
-    echo '(Press return key)'
-    read
-    emacs -nw %s
-    echo 'OK to commit this change? (press ^C if not)'
-    read
     fedpkg commit -c
-    echo 'OK to push this change? (press ^C if not)'
-    read
     fedpkg push
   " repodir
-    pkg
-    specfile