X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Goalfile;h=abbf7c9c7f02111f28f29ef1dd3953510ae5e2c4;hb=f716c1dd9296c96ed5d1707947f18b8a73fd54f3;hp=9587fd8bdcdb8c8aaac594cb48a74962af57606d;hpb=5a140e6812fdb9573dcc668513959618a5304e4a;p=fedora-ocaml-rebuild.git

diff --git a/Goalfile b/Goalfile
index 9587fd8..abbf7c9 100644
--- a/Goalfile
+++ b/Goalfile
@@ -5,16 +5,12 @@ include "fedora.gl"
 let fedora-dir = "%HOME/d/fedora"
 
 let fedora-branch = "master"
-let fedora-tag = "f33-build-side-19773"
+#let fedora-branch = "f32"
+let fedora-tag = "f34-build-side-28234"
 
 # The magic string that must appear in %changelog when the
 # package has been rebuilt.
-let fedora-rebuild-name = "OCaml 4.10.0 final."
-
-# Packages that are blocked.  Any dependent packages are also blocked
-# automatically.
-# XXX Not implemented, use ignore for now.
-#let fedora-blocked = [ "ocaml-camlp4" ]
+let fedora-rebuild-name = "OCaml 4.11.0 rebuild"
 
 # Packages that are ignored, which means they are treated as if
 # they have been rebuilt.
@@ -23,41 +19,191 @@ let fedora-ignored = [
 ]
 
 # All OCaml-related source package names
-let other-packages = [
-    "alt-ergo", "apron", "brltty",
-    "graphviz", "hevea", "hivex",
-    "libguestfs", "libnbd",
-    "virt-top", "virt-v2v",
-    "z3",
-
-    # no OCaml code, but needs to be rebuilt after Coq
-    #"flocq"
+let packages = [
+    "ocaml-alcotest",
+    "ocaml-ancient",
+    "ocaml-astring",
+    "ocaml-augeas",
+    "ocaml-autoconf",
+    "ocaml-base",
+    "ocaml-base64",
+    "ocaml-benchmark",
+    "ocaml-biniou",
+    "ocaml-bin-prot",
+    "ocaml-bisect-ppx",
+    "ocaml-cairo",
+    "ocaml-calendar",
+    "ocaml-camlidl",
+    "ocaml-camlimages",
+    "ocaml-camlp5",
+    "ocaml-camomile",
+    "ocaml-charinfo-width",
+    "ocaml-cil",
+    "ocaml-cinaps",
+    "ocaml-cmdliner",
+    "ocaml-compiler-libs-janestreet",
+    "ocaml-cppo",
+    "ocaml-cryptokit",
+    "ocaml-csv",
+    "ocaml-cudf",
+    "ocaml-curl",
+    "ocaml-curses",
+    "ocaml-dbus",
+    "ocaml-dose3",
+    "ocaml-dune",
+    "ocaml-easy-format",
+    "ocaml-expat",
+    "ocaml-extlib",
+    "ocaml-facile",
+    "ocaml-fieldslib",
+    "ocaml-fileutils",
+    "ocaml-findlib",
+    "ocaml-fmt",
+    "ocaml-fpath",
+    "ocaml-gen",
+    "ocaml-gettext",
+    "ocaml-gsl",
+    "ocamlify",
+    "ocaml-jane-street-headers",
+    "ocaml-jst-config",
+    "ocaml-lablgl",
+    "ocaml-lablgtk",
+    "ocaml-lablgtk3",
+    "ocaml-labltk",
+    "ocaml-lacaml",
+    "ocaml-lambda-term",
+    "ocaml-libvirt",
+    "ocaml-lwt",
+    "ocaml-lwt-log",
+    "ocaml-markup",
+    "ocaml-mccs",
+    "ocaml-menhir",
+    "ocaml-merlin",
+    "ocaml-mew",
+    "ocaml-mew-vi",
+    "ocaml-migrate-parsetree",
+    "ocaml-mlgmpidl",
+    "ocaml-mlmpfr",
+    "ocaml-mmap",
+    "ocamlmod",
+    "ocaml-mysql",
+    "ocaml-newt",
+    "ocaml-num",
+    "ocaml-oasis",
+    "ocaml-obuild",
+    "ocaml-ocamlbuild",
+    "ocaml-ocamlgraph",
+    "ocaml-ocamlnet",
+    "ocaml-ocp-indent",
+    "ocaml-ocplib-endian",
+    "ocaml-ocplib-simplex",
+    "ocaml-octavius",
+    "ocaml-odoc",
+    "ocaml-omake",
+    "ocaml-opam-file-format",
+    "ocaml-ounit",
+    "ocaml-parsexp",
+    "ocaml-pcre",
+    "ocaml-perl4caml",
+    "ocaml-postgresql",
+    "ocaml-ppx-assert",
+    "ocaml-ppx-base",
+    "ocaml-ppx-cold",
+    "ocaml-ppx-compare",
+    "ocaml-ppx-custom-printf",
+    "ocaml-ppx-derivers",
+    "ocaml-ppx-deriving",
+    "ocaml-ppx-deriving-yojson",
+    "ocaml-ppx-enumerate",
+    "ocaml-ppx-fields-conv",
+    "ocaml-ppxfind",
+    "ocaml-ppx-hash",
+    "ocaml-ppx-here",
+    "ocaml-ppx-inline-test",
+    "ocaml-ppx-js-style",
+    "ocaml-ppxlib",
+    "ocaml-ppx-optcomp",
+    "ocaml-ppx-sexp-conv",
+    "ocaml-ppx-tools",
+    "ocaml-ppx-tools-versioned",
+    "ocaml-ppx-variants-conv",
+    "ocaml-psmt2-frontend",
+    "ocaml-ptmap",
+    "ocaml-qcheck",
+    "ocaml-qtest",
+    "ocaml-re",
+    "ocaml-react",
+    "ocaml-res",
+    "ocaml-result",
+    "ocaml-rope",
+    "ocaml-SDL",
+    "ocaml-sedlex",
+    "ocaml-seq",
+    "ocaml-sexplib",
+    "ocaml-sexplib0",
+    "ocaml-sha",
+    "ocaml-sqlite",
+    "ocaml-ssl",
+    "ocaml-stdint",
+    "ocaml-stdio",
+    "ocaml-time-now",
+    "ocaml-topkg",
+    "ocaml-tplib",
+    "ocaml-trie",
+    "ocaml-tyxml",
+    "ocaml-uuidm",
+    "ocaml-uutf",
+    "ocaml-variantslib",
+    "ocaml-xml-light",
+    "ocaml-xmlm",
+    "ocaml-xmlrpc-light",
+    "ocaml-yojson",
+    "ocaml-zarith",
+    "ocaml-zed",
+    "ocaml-zip",
+    "ocaml-zmq",
 
-    # Coq problems:
-    # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/6I2CB4KNAZXH6TKX5WQZJ3ZQGBIOCNJK/
-    # "coq", "frama-c", "gappalib-coq",
-    # "why3", "zenon",
-    # "flocq",
+    "alt-ergo",
+    "apron",
+    "brltty",
+    "coccinelle",
+    "graphviz",
+    "haxe",
+    "hevea",
+    "hivex",
+    "laby",
+    "libguestfs",
+    "libnbd",
+    "opam",
+    "plplot",
+    "utop",
+    "virt-top",
+    "virt-v2v",
+    "why3",
+    "z3",
 
-    # Coccinelle uses -unsafe-string.
-    # "coccinelle",
+    # For Coq:
+    "coq",
+    "frama-c",
+    "gappalib-coq",
+    "zenon",
+    "flocq",
 
     # Causes a cyclic dependency between libnbd <-> nbdkit.  We need
     # to fix this in goals itself, but in the meantime disable nbdkit
     # and build it by hand.
-    # "nbdkit",
-
-    # https://bugzilla.redhat.com/show_bug.cgi?id=1797853
-    # "plplot",
-
-    # FTBFS because of a missing dependency.
-    # "opam",
+    #"nbdkit",
 ]
 
 pure function get-source-packages () returning strings = {
     cd %fedora-dir
-    for f in ocaml* %other-packages; do
-        [ -f $f/%fedora-branch/$f.spec ] && echo "$f"
+    for f in %packages; do
+        if [ -f $f/%fedora-branch/$f.spec ]; then
+            echo "$f"
+        else
+            echo "$f: package is not checked out locally" >&2
+            exit 1
+        fi
     done
 }
 let fedora-source-packages = get-source-packages ()