Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ocaml-ocaml-compiler-libs for openSUSE:Factory checked in at 2021-09-29 20:18:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-ocaml-compiler-libs (Old) and /work/SRC/openSUSE:Factory/.ocaml-ocaml-compiler-libs.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-ocaml-compiler-libs" Wed Sep 29 20:18:33 2021 rev:2 rq:921274 version:0.12.4 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-ocaml-compiler-libs/ocaml-ocaml-compiler-libs.changes 2021-04-29 01:37:43.254520651 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml-ocaml-compiler-libs.new.1899/ocaml-ocaml-compiler-libs.changes 2021-09-29 20:19:37.691050570 +0200 @@ -1,0 +2,6 @@ +Sat Sep 11 12:34:56 UTC 2021 - oher...@suse.de + +- Update to version 0.12.4 + remove ocaml-ocaml-compiler-libs.patch, merged upstream + +------------------------------------------------------------------- Old: ---- ocaml-ocaml-compiler-libs-0.12.3.tar.xz ocaml-ocaml-compiler-libs.patch New: ---- ocaml-ocaml-compiler-libs-0.12.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-ocaml-compiler-libs.spec ++++++ --- /var/tmp/diff_new_pack.rSe4H3/_old 2021-09-29 20:19:38.079051132 +0200 +++ /var/tmp/diff_new_pack.rSe4H3/_new 2021-09-29 20:19:38.083051138 +0200 @@ -17,7 +17,7 @@ Name: ocaml-ocaml-compiler-libs -Version: 0.12.3 +Version: 0.12.4 Release: 0 %{?ocaml_preserve_bytecode} Summary: Compiler libraries repackaged @@ -26,10 +26,9 @@ BuildRoot: %_tmppath/%name-%version-build URL: https://opam.ocaml.org/packages/ocaml-compiler-libs Source0: %{name}-%{version}.tar.xz -Patch0: ocaml-ocaml-compiler-libs.patch BuildRequires: ocaml(ocaml_base_version) >= 4.04 -BuildRequires: ocaml-dune -BuildRequires: ocaml-rpm-macros >= 20210409 +BuildRequires: ocaml-dune >= 2.8 +BuildRequires: ocaml-rpm-macros >= 20210911 BuildRequires: ocamlfind(compiler-libs.bytecomp) BuildRequires: ocamlfind(compiler-libs.common) BuildRequires: ocamlfind(compiler-libs.optcomp) @@ -51,7 +50,6 @@ %prep %setup -q -%patch0 -p1 %build dune_release_pkgs='ocaml-compiler-libs' ++++++ _service ++++++ --- /var/tmp/diff_new_pack.rSe4H3/_old 2021-09-29 20:19:38.107051173 +0200 +++ /var/tmp/diff_new_pack.rSe4H3/_new 2021-09-29 20:19:38.111051178 +0200 @@ -1,7 +1,7 @@ <services> <service name="tar_scm" mode="disabled"> <param name="filename">ocaml-ocaml-compiler-libs</param> - <param name="revision">7f5d1d2931b96fb3ee6dd569a469b51f621a6dd4</param> + <param name="revision">8cd12f18bb7171c2b67d661868c4271fae528d93</param> <param name="scm">git</param> <param name="submodules">disable</param> <param name="url">https://github.com/janestreet/ocaml-compiler-libs.git</param> ++++++ ocaml-ocaml-compiler-libs-0.12.3.tar.xz -> ocaml-ocaml-compiler-libs-0.12.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ocaml-compiler-libs-0.12.3/.gitignore new/ocaml-ocaml-compiler-libs-0.12.4/.gitignore --- old/ocaml-ocaml-compiler-libs-0.12.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocaml-ocaml-compiler-libs-0.12.4/.gitignore 2021-08-24 13:21:38.000000000 +0200 @@ -0,0 +1,4 @@ +_build +*.install +*.merlin + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ocaml-compiler-libs-0.12.3/.ocamlformat new/ocaml-ocaml-compiler-libs-0.12.4/.ocamlformat --- old/ocaml-ocaml-compiler-libs-0.12.3/.ocamlformat 1970-01-01 01:00:00.000000000 +0100 +++ new/ocaml-ocaml-compiler-libs-0.12.4/.ocamlformat 2021-08-24 13:21:38.000000000 +0200 @@ -0,0 +1,20 @@ +version=0.19.0 +profile=conventional +break-separators=before +dock-collection-brackets=false +break-sequences=true +doc-comments=before +field-space=loose +let-and=sparse +sequence-style=terminator +type-decl=sparse +wrap-comments=true +if-then-else=k-r +let-and=sparse +space-around-records +space-around-lists +space-around-arrays +cases-exp-indent=2 +break-cases=all +indicate-nested-or-patterns=unsafe-no +parse-docstrings=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ocaml-compiler-libs-0.12.3/CHANGES.md new/ocaml-ocaml-compiler-libs-0.12.4/CHANGES.md --- old/ocaml-ocaml-compiler-libs-0.12.3/CHANGES.md 2020-09-21 13:37:41.000000000 +0200 +++ new/ocaml-ocaml-compiler-libs-0.12.4/CHANGES.md 2021-08-24 13:21:38.000000000 +0200 @@ -1,3 +1,8 @@ +v0.12.4 +------- + +- Make the build more reproducible (@jeremiedimino, fix #6) + v0.12.3 ------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ocaml-compiler-libs-0.12.3/dune-project new/ocaml-ocaml-compiler-libs-0.12.4/dune-project --- old/ocaml-ocaml-compiler-libs-0.12.3/dune-project 2020-09-21 13:37:41.000000000 +0200 +++ new/ocaml-ocaml-compiler-libs-0.12.4/dune-project 2021-08-24 13:21:38.000000000 +0200 @@ -1,2 +1,18 @@ -(lang dune 1.0) +(lang dune 2.8) + (name ocaml-compiler-libs) +(license MIT) +(maintainers "Jane Street developers") +(authors "Jane Street Group, LLC") +(source (github janestreet/ocaml-compiler-libs)) + +(package + (name ocaml-compiler-libs) + (depends + (ocaml (>= 4.04.1))) + (synopsis "OCaml compiler libraries repackaged") + (description "\ +This packages exposes the OCaml compiler libraries repackages under +the toplevel names Ocaml_common, Ocaml_bytecomp, Ocaml_optcomp, ...")) + +(generate_opam_files true) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ocaml-compiler-libs-0.12.3/ocaml-compiler-libs.opam new/ocaml-ocaml-compiler-libs-0.12.4/ocaml-compiler-libs.opam --- old/ocaml-ocaml-compiler-libs-0.12.3/ocaml-compiler-libs.opam 2020-09-21 13:37:41.000000000 +0200 +++ new/ocaml-ocaml-compiler-libs-0.12.4/ocaml-compiler-libs.opam 2021-08-24 13:21:38.000000000 +0200 @@ -1,20 +1,31 @@ +# This file is generated by dune, edit dune-project instead opam-version: "2.0" -maintainer: "opensou...@janestreet.com" -authors: ["Jane Street Group, LLC <opensou...@janestreet.com>"] +synopsis: "OCaml compiler libraries repackaged" +description: """ +This packages exposes the OCaml compiler libraries repackages under +the toplevel names Ocaml_common, Ocaml_bytecomp, Ocaml_optcomp, ...""" +maintainer: ["Jane Street developers"] +authors: ["Jane Street Group, LLC"] +license: "MIT" homepage: "https://github.com/janestreet/ocaml-compiler-libs" bug-reports: "https://github.com/janestreet/ocaml-compiler-libs/issues" -dev-repo: "git+https://github.com/janestreet/ocaml-compiler-libs.git" -license: "MIT" -build: [ - ["dune" "build" "-p" name "-j" jobs] -] depends: [ + "dune" {>= "2.8"} "ocaml" {>= "4.04.1"} - "dune" {build & >= "1.5.1"} + "odoc" {with-doc} ] -synopsis: """OCaml compiler libraries repackaged""" -description: """ - -This packages exposes the OCaml compiler libraries repackages under -the toplevel names Ocaml_common, Ocaml_bytecomp, Ocaml_optcomp, ... -""" +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +dev-repo: "git+https://github.com/janestreet/ocaml-compiler-libs.git" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ocaml-compiler-libs-0.12.3/src/gen/gen.ml new/ocaml-ocaml-compiler-libs-0.12.4/src/gen/gen.ml --- old/ocaml-ocaml-compiler-libs-0.12.3/src/gen/gen.ml 2020-09-21 13:37:41.000000000 +0200 +++ new/ocaml-ocaml-compiler-libs-0.12.4/src/gen/gen.ml 2021-08-24 13:21:38.000000000 +0200 @@ -3,19 +3,17 @@ https://github.com/ocaml/ocaml/pull/1010 - It's going to be hard to do this for compiler-libs as it is a big breaking change. So - we expect the gen.ml file in Base to go soon and this file to stay for longer. -*) + It's going to be hard to do this for compiler-libs as it is a big breaking + change. So we expect the gen.ml file in Base to go soon and this file to stay + for longer. *) open StdLabels let () = let archive_fn, oc = match Sys.argv with - | [|_; "-archive"; archive_fn; "-o"; fn|] -> - (archive_fn, open_out fn) - | _ -> - failwith "bad command line arguments" + | [| _; "-archive"; archive_fn; "-o"; fn |] -> (archive_fn, open_out fn) + | _ -> failwith "bad command line arguments" in let units = Read_cma.units archive_fn in @@ -25,6 +23,6 @@ pr ""; let max_len = List.fold_left units ~init:0 ~f:(fun acc unit -> - max acc (String.length unit)) + max acc (String.length unit)) in - List.iter units ~f:(fun u -> pr "module %-*s = %s" max_len u u); + List.iter units ~f:(fun u -> pr "module %-*s = %s" max_len u u) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ocaml-compiler-libs-0.12.3/src/ocaml_bytecomp/dune new/ocaml-ocaml-compiler-libs-0.12.4/src/ocaml_bytecomp/dune --- old/ocaml-ocaml-compiler-libs-0.12.3/src/ocaml_bytecomp/dune 2020-09-21 13:37:41.000000000 +0200 +++ new/ocaml-ocaml-compiler-libs-0.12.4/src/ocaml_bytecomp/dune 2021-08-24 13:21:38.000000000 +0200 @@ -10,5 +10,9 @@ (deps (:first_dep ../gen/gen.exe)) (action - (run %{first_dep} -archive %{ocaml_where}/compiler-libs/ocamlbytecomp.cma -o - %{targets}))) + (run + %{first_dep} + -archive + %{ocaml_where}/compiler-libs/ocamlbytecomp.cma + -o + %{targets}))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ocaml-compiler-libs-0.12.3/src/ocaml_common/dune new/ocaml-ocaml-compiler-libs-0.12.4/src/ocaml_common/dune --- old/ocaml-ocaml-compiler-libs-0.12.3/src/ocaml_common/dune 2020-09-21 13:37:41.000000000 +0200 +++ new/ocaml-ocaml-compiler-libs-0.12.4/src/ocaml_common/dune 2021-08-24 13:21:38.000000000 +0200 @@ -10,5 +10,9 @@ (deps (:first_dep ../gen/gen.exe)) (action - (run %{first_dep} -archive %{ocaml_where}/compiler-libs/ocamlcommon.cma -o - %{targets}))) + (run + %{first_dep} + -archive + %{ocaml_where}/compiler-libs/ocamlcommon.cma + -o + %{targets}))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ocaml-compiler-libs-0.12.3/src/ocaml_optcomp/dune new/ocaml-ocaml-compiler-libs-0.12.4/src/ocaml_optcomp/dune --- old/ocaml-ocaml-compiler-libs-0.12.3/src/ocaml_optcomp/dune 2020-09-21 13:37:41.000000000 +0200 +++ new/ocaml-ocaml-compiler-libs-0.12.4/src/ocaml_optcomp/dune 2021-08-24 13:21:38.000000000 +0200 @@ -11,5 +11,9 @@ (deps (:first_dep ../gen/gen.exe)) (action - (run %{first_dep} -archive %{ocaml_where}/compiler-libs/ocamloptcomp.cma -o - %{targets}))) + (run + %{first_dep} + -archive + %{ocaml_where}/compiler-libs/ocamloptcomp.cma + -o + %{targets}))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ocaml-compiler-libs-0.12.3/src/ocaml_toplevel/dune new/ocaml-ocaml-compiler-libs-0.12.4/src/ocaml_toplevel/dune --- old/ocaml-ocaml-compiler-libs-0.12.3/src/ocaml_toplevel/dune 2020-09-21 13:37:41.000000000 +0200 +++ new/ocaml-ocaml-compiler-libs-0.12.4/src/ocaml_toplevel/dune 2021-08-24 13:21:38.000000000 +0200 @@ -10,5 +10,9 @@ (deps (:first_dep ../gen/gen.exe)) (action - (run %{first_dep} -archive %{ocaml_where}/compiler-libs/ocamltoplevel.cma -o - %{targets}))) + (run + %{first_dep} + -archive + %{ocaml_where}/compiler-libs/ocamltoplevel.cma + -o + %{targets}))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ocaml-compiler-libs-0.12.3/src/read_cma/read_cma.ml new/ocaml-ocaml-compiler-libs-0.12.4/src/read_cma/read_cma.ml --- old/ocaml-ocaml-compiler-libs-0.12.3/src/read_cma/read_cma.ml 2020-09-21 13:37:41.000000000 +0200 +++ new/ocaml-ocaml-compiler-libs-0.12.4/src/read_cma/read_cma.ml 2021-08-24 13:21:38.000000000 +0200 @@ -1,7 +1,8 @@ open StdLabels let units fn = - (* The cma format is documented in typing/cmo_format.mli in the compiler sources *) + (* The cma format is documented in typing/cmo_format.mli in the compiler + sources *) let ic = open_in_bin fn in let len_magic_number = String.length Config.cma_magic_number in let magic_number = really_input_string ic len_magic_number in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ocaml-compiler-libs-0.12.3/src/shadow/gen/gen.ml new/ocaml-ocaml-compiler-libs-0.12.4/src/shadow/gen/gen.ml --- old/ocaml-ocaml-compiler-libs-0.12.3/src/shadow/gen/gen.ml 2020-09-21 13:37:41.000000000 +0200 +++ new/ocaml-ocaml-compiler-libs-0.12.4/src/shadow/gen/gen.ml 2021-08-24 13:21:38.000000000 +0200 @@ -1,57 +1,57 @@ module List = ListLabels open MoreLabels - -module Smap = Map.Make(String) +module Smap = Map.Make (String) let () = let dir, oc = match Sys.argv with - | [|_; "-dir"; dir; "-o"; fn|] -> - (dir, open_out fn) - | _ -> - failwith "bad command line arguments" + | [| _; "-dir"; dir; "-o"; fn |] -> (dir, open_out fn) + | _ -> failwith "bad command line arguments" in - let files = Sys.readdir dir |> Array.to_list in + let files = + Sys.readdir dir |> Array.to_list |> List.sort ~cmp:String.compare + in let all_exposed_modules = List.filter files ~f:(fun fn -> Filename.check_suffix fn ".cmi") - |> List.map ~f:(fun fn -> String.capitalize_ascii (Filename.chop_extension fn)) + |> List.map ~f:(fun fn -> + String.capitalize_ascii (Filename.chop_extension fn)) in let module_to_lib = List.filter files ~f:(fun fn -> Filename.check_suffix fn ".cma") |> List.fold_left ~init:Smap.empty ~f:(fun acc fn -> - let lib_mod = - try - Scanf.sscanf fn "ocaml%s.cma" (fun s -> "Ocaml_" ^ s) - with _ -> - String.capitalize_ascii (Filename.chop_extension fn) - in - let units = Read_cma.units (Filename.concat dir fn) in - List.fold_left units ~init:acc ~f:(fun acc unit -> - Smap.add acc ~key:unit ~data:lib_mod)) + let lib_mod = + try Scanf.sscanf fn "ocaml%s.cma" (fun s -> "Ocaml_" ^ s) with + | _ -> String.capitalize_ascii (Filename.chop_extension fn) + in + let units = Read_cma.units (Filename.concat dir fn) in + List.fold_left units ~init:acc ~f:(fun acc unit -> + Smap.add acc ~key:unit ~data:lib_mod)) in (* If we keep the alias, we can't use -linkall... *) Printf.fprintf oc "module Do_not_use_directly = struct end\n"; List.sort all_exposed_modules ~cmp:String.compare |> List.iter ~f:(fun m -> - let repl = - match Smap.find m module_to_lib with - | lib -> - let lib = - let prefix = "Ocaml" in - let prefix_len = String.length prefix in - let lib_len = String.length lib in - if lib_len >= prefix_len && String.sub lib 0 prefix_len = prefix then - prefix ^ "_" ^ String.sub lib prefix_len (lib_len - prefix_len) - else - lib - in - Printf.sprintf ", use %s.%s instead" lib m - | exception Not_found -> "" - in - Printf.fprintf oc - "module %s = Do_not_use_directly [@@deprecated \"Accessing this module directly is deprecated%s\"]\n" - m repl) + let repl = + match Smap.find m module_to_lib with + | lib -> + let lib = + let prefix = "Ocaml" in + let prefix_len = String.length prefix in + let lib_len = String.length lib in + if lib_len >= prefix_len && String.sub lib 0 prefix_len = prefix + then + prefix ^ "_" ^ String.sub lib prefix_len (lib_len - prefix_len) + else + lib + in + Printf.sprintf ", use %s.%s instead" lib m + | exception Not_found -> "" + in + Printf.fprintf oc + "module %s = Do_not_use_directly [@@deprecated \"Accessing this \ + module directly is deprecated%s\"]\n" + m repl)