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-0.8.git10e45753.fc22"
+let rebuild_name = "OCaml 4.08.0 (beta 3)"
(* Local repository that contains build dependencies. *)
let yum_repo = "koji-rawhide"
* dependent packages.
*)
let blocked = [
- "ocaml-omake"; (* build failure (warnings) *)
- "ocaml-pa-do"; (* build failure, complex *)
- "ocaml-preludeml"; (* build failure *)
- "frama-c"; (* build failure *)
- "gappalib-coq"; (* build failure in configure script *)
+ "ocaml-camlp4"; (* not ported to 4.08 yet *)
+ "ocaml-camlp5"; (* not ported to 4.08 yet *)
+ "ocaml-zarith"; (* build failures, seemingly unrelated *)
+ "ocaml-yojson"; (* seems to require some proper attention *)
]
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";
+ "opam"; "plplot"; "virt-top"; "why3"; "z3";
"flocq" (* no OCaml code, but needs to be rebuilt after Coq *);
- "guestfs-browser" ]
+ "guestfs-browser"; "libguestfs" ]
(* Dependencies of each package. (pkg, [deps ...]) *)
let pkg_deps = dependencies branch source_packages
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" ""
(* 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
loop ()
)
+(*
and local_build_succeeded pkg =
(* The specfile must have been updated. *)
require (specfile_updated pkg);
" (fedora_repo pkg branch);
memory_set key "1"
+*)
and specfile_updated pkg =
let repodir = fedora_repo pkg branch in
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'.
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