Hello community, here is the log from the commit of package ocaml-gen for openSUSE:Factory checked in at 2020-08-24 15:06:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-gen (Old) and /work/SRC/openSUSE:Factory/.ocaml-gen.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-gen" Mon Aug 24 15:06:24 2020 rev:5 rq:828684 version:0.5.3 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-gen/ocaml-gen.changes 2019-11-12 16:12:16.707807750 +0100 +++ /work/SRC/openSUSE:Factory/.ocaml-gen.new.3399/ocaml-gen.changes 2020-08-24 15:06:46.942501651 +0200 @@ -1,0 +2,6 @@ +Thu Aug 20 20:20:20 UTC 2020 - [email protected] + +- Update to version 0.5.3 + See included CHANGELOG.md for details + +------------------------------------------------------------------- Old: ---- ocaml-gen-0.5.2.tar.xz New: ---- ocaml-gen-0.5.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-gen.spec ++++++ --- /var/tmp/diff_new_pack.k5RX45/_old 2020-08-24 15:06:47.890502113 +0200 +++ /var/tmp/diff_new_pack.k5RX45/_new 2020-08-24 15:06:47.894502115 +0200 @@ -1,7 +1,7 @@ # # spec file for package ocaml-gen # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,21 +17,22 @@ Name: ocaml-gen -Version: 0.5.2 +Version: 0.5.3 Release: 0 %{?ocaml_preserve_bytecode} Summary: Simple, efficient iterators for OCaml License: BSD-2-Clause Group: Development/Languages/OCaml -URL: https://github.com/c-cube/gen +URL: https://opam.ocaml.org/packages/gen Source0: %{name}-%{version}.tar.xz BuildRequires: ocaml BuildRequires: ocaml-dune -BuildRequires: ocaml-rpm-macros >= 20191101 +BuildRequires: ocaml-rpm-macros >= 20200514 BuildRequires: ocamlfind(bytes) +BuildRequires: ocamlfind(dune.configurator) +BuildRequires: ocamlfind(oUnit) BuildRequires: ocamlfind(qcheck) BuildRequires: ocamlfind(qtest) -BuildRequires: ocamlfind(oUnit) %description Iterators for OCaml, both restartable and consumable. ++++++ _service ++++++ --- /var/tmp/diff_new_pack.k5RX45/_old 2020-08-24 15:06:47.926502131 +0200 +++ /var/tmp/diff_new_pack.k5RX45/_new 2020-08-24 15:06:47.926502131 +0200 @@ -1,7 +1,7 @@ <services> <service name="tar_scm" mode="disabled"> <param name="filename">ocaml-gen</param> - <param name="revision">runtest-0.5.2</param> + <param name="revision">runtest-0.5.3</param> <param name="scm">git</param> <param name="submodules">disable</param> <param name="url">https://github.com/olafhering/ocaml-gen.git</param> ++++++ ocaml-gen-0.5.2.tar.xz -> ocaml-gen-0.5.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-gen-0.5.2/.travis.yml new/ocaml-gen-0.5.3/.travis.yml --- old/ocaml-gen-0.5.2/.travis.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/ocaml-gen-0.5.3/.travis.yml 2019-11-04 08:56:10.000000000 +0100 @@ -0,0 +1,19 @@ +language: c +install: wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-docker.sh +script: bash -ex .travis-docker.sh +services: +- docker +env: + global: + - PINS="gen:." + - DISTRO="ubuntu-16.04" + - PACKAGE="gen" + matrix: + - OCAML_VERSION="4.03" + #- OCAML_VERSION="4.04" + #- PACKAGE="iter" OCAML_VERSION="4.05" EXTRA_DEPS="base-bigarray" + - OCAML_VERSION="4.06" + - OCAML_VERSION="4.07" + - OCAML_VERSION="4.08" + #- OCAML_VERSION="4.09" + - OCAML_VERSION="4.10" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-gen-0.5.2/CHANGELOG.md new/ocaml-gen-0.5.3/CHANGELOG.md --- old/ocaml-gen-0.5.2/CHANGELOG.md 2019-11-04 08:51:11.000000000 +0100 +++ new/ocaml-gen-0.5.3/CHANGELOG.md 2019-11-04 08:56:10.000000000 +0100 @@ -1,5 +1,9 @@ # Changelog +# 0.5.3 + +- fix npm-package contents to actually include compiled output. (oops!) + # 0.5.2 - explicitly support BuckleScript, and publish to npm as bs-gen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-gen-0.5.2/README.md new/ocaml-gen-0.5.3/README.md --- old/ocaml-gen-0.5.2/README.md 2019-11-04 08:51:11.000000000 +0100 +++ new/ocaml-gen-0.5.3/README.md 2019-11-04 08:56:10.000000000 +0100 @@ -1,4 +1,4 @@ -# Gen +# Gen [](https://travis-ci.org/c-cube/gen) Iterators for OCaml, both restartable and consumable. The implementation keeps a good balance between simplicity and performance. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-gen-0.5.2/bsconfig.json new/ocaml-gen-0.5.3/bsconfig.json --- old/ocaml-gen-0.5.2/bsconfig.json 2019-11-04 08:51:11.000000000 +0100 +++ new/ocaml-gen-0.5.3/bsconfig.json 2019-11-04 08:56:10.000000000 +0100 @@ -1,6 +1,6 @@ { "name": "bs-gen", - "version": "0.5.2", + "version": "0.5.3", "sources": [ { "dir": "src", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-gen-0.5.2/gen.opam new/ocaml-gen-0.5.3/gen.opam --- old/ocaml-gen-0.5.2/gen.opam 2019-11-04 08:51:11.000000000 +0100 +++ new/ocaml-gen-0.5.3/gen.opam 2019-11-04 08:56:10.000000000 +0100 @@ -3,19 +3,20 @@ synopsis: "Iterators for OCaml, both restartable and consumable" author: [ "Simon Cruanes" "ELLIOTTCABLE" ] name: "gen" -version: "0.5.2" +version: "0.5.3" build: [ ["dune" "build" "@install" "-p" name] ["dune" "runtest" "-p" name] {with-test} ["dune" "build" "@doc" "-p" name] {with-doc} ] depends: [ - "dune" {build} + "dune" {>= "1.1"} + "dune-configurator" "base-bytes" "odoc" {with-doc} - "qtest" {with-test} "qcheck" {with-test} "qtest" {with-test} + "ocaml" { >= "4.03.0" } ] tags: [ "gen" "iterator" "iter" "fold" ] homepage: "https://github.com/c-cube/gen/"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-gen-0.5.2/package-lock.json new/ocaml-gen-0.5.3/package-lock.json --- old/ocaml-gen-0.5.2/package-lock.json 2019-11-04 08:51:11.000000000 +0100 +++ new/ocaml-gen-0.5.3/package-lock.json 2019-11-04 08:56:10.000000000 +0100 @@ -1,13 +1,13 @@ { "name": "bs-gen", - "version": "0.5.2", + "version": "0.5.3", "lockfileVersion": 1, "requires": true, "dependencies": { "bs-platform": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/bs-platform/-/bs-platform-4.0.3.tgz";, - "integrity": "sha1-RRDByRXMWxabVxflwK2lLT+Z/5g=", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/bs-platform/-/bs-platform-5.2.1.tgz";, + "integrity": "sha512-3ISP+RBC/NYILiJnphCY0W3RTYpQ11JGa2dBBLVug5fpFZ0qtSaL3ZplD8MyjNeXX2bC7xgrWfgBSn8Tc9om7Q==", "dev": true } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-gen-0.5.2/package.json new/ocaml-gen-0.5.3/package.json --- old/ocaml-gen-0.5.2/package.json 2019-11-04 08:51:11.000000000 +0100 +++ new/ocaml-gen-0.5.3/package.json 2019-11-04 08:56:10.000000000 +0100 @@ -1,6 +1,6 @@ { "name": "bs-gen", - "version": "0.5.2", + "version": "0.5.3", "description": "Simple, efficient iterators for OCaml", "main": "src/gen.bs.js", "scripts": { @@ -8,6 +8,13 @@ "clean": "bsb -clean-world", "test": "echo \"Error: no test specified\" && exit 1" }, + "files": [ + "bsconfig.json", + "src", + "!**/dune", + "!**/dune-project", + "!**/.merlin" + ], "keywords": [ "BuckleScript", "ReasonML", @@ -24,18 +31,18 @@ "url": "git+https://github.com/c-cube/gen.git"; }, "contributors": [ - "Simon Cruanes <[email protected]>", - "ELLIOTTCABLE <[email protected]>" + "Simon Cruanes <[email protected]>", + "ELLIOTTCABLE <[email protected]>" ], "license": "BSD-2-Clause", "bugs": { "url": "https://github.com/c-cube/gen/issues"; }, - "homepage": "http://cedeela.fr/~simon/software/gen";, + "homepage": "http://c-cube.github.io/gen/";, "devDependencies": { - "bs-platform": "^4.0.3" + "bs-platform": "^5.2.1" }, "peerDependencies": { - "bs-platform": ">=4.0.0" + "bs-platform": ">=5.0.0" } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-gen-0.5.2/src/dune new/ocaml-gen-0.5.3/src/dune --- old/ocaml-gen-0.5.2/src/dune 2019-11-04 08:51:11.000000000 +0100 +++ new/ocaml-gen-0.5.3/src/dune 2019-11-04 08:56:10.000000000 +0100 @@ -1,17 +1,25 @@ +(executable + (name mkshims) + (modules mkshims) + (libraries dune.configurator)) + +(rule + (targets GenShims_.ml) + (deps ./mkshims.exe) + (action (run ./mkshims.exe))) + (rule (targets flambda.flags) (deps (file mkflags.ml)) (mode fallback) - (action - (run ocaml ./mkflags.ml)) - ) + (action (run ocaml ./mkflags.ml))) (library (name gen) (public_name gen) (wrapped false) - (modules Gen GenLabels GenM GenClone GenMList GenM_intf Gen_intf GenLabels_intf) - (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string -nolabels) + (modules Gen GenLabels GenM GenClone GenMList GenM_intf Gen_intf GenLabels_intf GenShims_) + (flags :standard -warn-error -a+8 -safe-string -nolabels) (ocamlopt_flags :standard (:include flambda.flags)) (libraries bytes) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-gen-0.5.2/src/gen.ml new/ocaml-gen-0.5.3/src/gen.ml --- old/ocaml-gen-0.5.2/src/gen.ml 2019-11-04 08:51:11.000000000 +0100 +++ new/ocaml-gen-0.5.3/src/gen.ml 2019-11-04 08:56:10.000000000 +0100 @@ -376,7 +376,7 @@ (*$Q (Q.pair Q.small_int (Q.list Q.small_int)) (fun (n,l) -> \ - of_list l |> take n |> length = Pervasives.min n (List.length l)) + of_list l |> take n |> length = GenShims_.Stdlib.min n (List.length l)) *) (* call [gen] at most [n] times, and stop *) @@ -668,7 +668,7 @@ eq (of_list l1)(of_list l2) = (l1 = l2)) *) -let lexico ?(cmp=Pervasives.compare) gen1 gen2 = +let lexico ?(cmp=GenShims_.Stdlib.compare) gen1 gen2 = let rec lexico () = match gen1(), gen2() with | None, None -> 0 @@ -684,7 +684,7 @@ (*$Q (Q.pair (Q.list Q.small_int)(Q.list Q.small_int)) (fun (l1,l2) -> \ let sign x = if x < 0 then -1 else if x=0 then 0 else 1 in \ - sign (compare (of_list l1)(of_list l2)) = sign (Pervasives.compare l1 l2)) + sign (compare (of_list l1)(of_list l2)) = sign (GenShims_.Stdlib.compare l1 l2)) *) let rec find p e = match e () with @@ -838,17 +838,17 @@ (*$T merge (of_list [of_list [1;3;5]; of_list [2;4;6]; of_list [7;8;9]]) \ - |> to_list |> List.sort Pervasives.compare = [1;2;3;4;5;6;7;8;9] + |> to_list |> List.sort GenShims_.Stdlib.compare = [1;2;3;4;5;6;7;8;9] *) (*$R let e = of_list [1--3; 4--6; 7--9] in let e' = merge e in OUnit.assert_equal [1;2;3;4;5;6;7;8;9] - (to_list e' |> List.sort Pervasives.compare); + (to_list e' |> List.sort GenShims_.Stdlib.compare); *) -let intersection ?(cmp=Pervasives.compare) gen1 gen2 = +let intersection ?(cmp=GenShims_.Stdlib.compare) gen1 gen2 = let x1 = ref (gen1 ()) in let x2 = ref (gen2 ()) in let rec next () = @@ -869,7 +869,7 @@ |> to_list = [1;2;4;8] *) -let sorted_merge ?(cmp=Pervasives.compare) gen1 gen2 = +let sorted_merge ?(cmp=GenShims_.Stdlib.compare) gen1 gen2 = let x1 = ref (gen1 ()) in let x2 = ref (gen2 ()) in fun () -> @@ -937,7 +937,7 @@ x end -let sorted_merge_n ?(cmp=Pervasives.compare) l = +let sorted_merge_n ?(cmp=GenShims_.Stdlib.compare) l = (* make a heap of (value, generator) *) let cmp (v1,_) (v2,_) = cmp v1 v2 in let heap = Heap.empty ~cmp in @@ -1169,7 +1169,7 @@ (*$T product (1--3) (of_list ["a"; "b"]) |> to_list \ - |> List.sort Pervasives.compare = \ + |> List.sort GenShims_.Stdlib.compare = \ [1, "a"; 1, "b"; 2, "a"; 2, "b"; 3, "a"; 3, "b"] *) @@ -1177,7 +1177,7 @@ let printer = pi2list in let e = Gen.product (1--3) (4--5) in OUnit.assert_equal ~printer [1,4; 1,5; 2,4; 2,5; 3,4; 3,5] - (List.sort Pervasives.compare (Gen.to_list e)); + (List.sort GenShims_.Stdlib.compare (Gen.to_list e)); *) (* Group equal consecutive elements together. *) @@ -1232,7 +1232,7 @@ [0;1;0;2;3;4;5;10] *) -let sort ?(cmp=Pervasives.compare) gen = +let sort ?(cmp=GenShims_.Stdlib.compare) gen = (* build heap *) let h = Heap.empty ~cmp in iter (Heap.insert h) gen; @@ -1248,7 +1248,7 @@ (* NOTE: using a set is not really possible, because once we have built the set there is no simple way to iterate on it *) -let sort_uniq ?(cmp=Pervasives.compare) gen = +let sort_uniq ?(cmp=GenShims_.Stdlib.compare) gen = uniq ~eq:(fun x y -> cmp x y = 0) (sort ~cmp gen) (*$T @@ -1350,7 +1350,7 @@ next (make_machine (List.length l) l) (*$T permutations - permutations (1--3) |> to_list |> List.sort Pervasives.compare = \ + permutations (1--3) |> to_list |> List.sort GenShims_.Stdlib.compare = \ [[1;2;3]; [1;3;2]; [2;1;3]; [2;3;1]; [3;1;2]; [3;2;1]] permutations empty |> to_list = [[]] permutations (singleton 1) |> to_list = [[1]] @@ -1434,7 +1434,7 @@ else next {elts = a; n=n; is=[0]} (*$T permutations_heap - permutations_heap (1--3) |> to_list |> List.sort Pervasives.compare = \ + permutations_heap (1--3) |> to_list |> List.sort GenShims_.Stdlib.compare = \ [[|1;2;3|]; [|1;3;2|]; [|2;1;3|]; [|2;3;1|]; [|3;1;2|]; [|3;2;1|]] permutations_heap empty |> to_list = [] permutations_heap (singleton 1) |> to_list = [[|1|]] @@ -1480,8 +1480,8 @@ next (make_state n l) (*$T - combinations 2 (1--4) |> map (List.sort Pervasives.compare) \ - |> to_list |> List.sort Pervasives.compare = \ + combinations 2 (1--4) |> map (List.sort GenShims_.Stdlib.compare) \ + |> to_list |> List.sort GenShims_.Stdlib.compare = \ [[1;2]; [1;3]; [1;4]; [2;3]; [2;4]; [3;4]] combinations 0 (1--4) |> to_list = [[]] combinations 1 (singleton 1) |> to_list = [[1]] @@ -1521,12 +1521,12 @@ next (make_state l) (*$T - power_set (1--3) |> map (List.sort Pervasives.compare) \ - |> to_list |> List.sort Pervasives.compare = \ + power_set (1--3) |> map (List.sort GenShims_.Stdlib.compare) \ + |> to_list |> List.sort GenShims_.Stdlib.compare = \ [[]; [1]; [1;2]; [1;2;3]; [1;3]; [2]; [2;3]; [3]] power_set empty |> to_list = [[]] - power_set (singleton 1) |> map (List.sort Pervasives.compare) \ - |> to_list |> List.sort Pervasives.compare = [[]; [1]] + power_set (singleton 1) |> map (List.sort GenShims_.Stdlib.compare) \ + |> to_list |> List.sort GenShims_.Stdlib.compare = [[]; [1]] *) (** {3 Conversion} *) @@ -1843,10 +1843,10 @@ let uniq ?eq e () = uniq ?eq (e ()) - let sort ?(cmp=Pervasives.compare) enum = + let sort ?(cmp=GenShims_.Stdlib.compare) enum = fun () -> sort ~cmp (enum ()) - let sort_uniq ?(cmp=Pervasives.compare) e = + let sort_uniq ?(cmp=GenShims_.Stdlib.compare) e = let e' = sort ~cmp e in uniq ~eq:(fun x y -> cmp x y = 0) e' @@ -1902,7 +1902,7 @@ match !cached with | Some mlist -> GenMList.to_gen mlist | None -> - let mlist = GenMList.of_gen_lazy ?caching ?max_chunk_size g in + let mlist = GenMList.of_gen_lazy ?max_chunk_size ?caching g in cached := Some mlist; GenMList.to_gen mlist end @@ -1936,7 +1936,7 @@ *) let persistent_lazy ?caching ?max_chunk_size gen = - let l = GenMList.of_gen_lazy ?caching ?max_chunk_size gen in + let l = GenMList.of_gen_lazy ?max_chunk_size ?caching gen in fun () -> GenMList.to_gen l (*$T diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-gen-0.5.2/src/genClone.ml new/ocaml-gen-0.5.3/src/genClone.ml --- old/ocaml-gen-0.5.2/src/genClone.ml 2019-11-04 08:51:11.000000000 +0100 +++ new/ocaml-gen-0.5.3/src/genClone.ml 2019-11-04 08:56:10.000000000 +0100 @@ -7,6 +7,7 @@ class virtual ['a] t = object method virtual gen : 'a gen (** Generator of values tied to this copy *) + method virtual clone : 'a t (** Clone the internal state *) end (** A generator that can be cloned as many times as required. *) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-gen-0.5.2/src/mkshims.ml new/ocaml-gen-0.5.3/src/mkshims.ml --- old/ocaml-gen-0.5.2/src/mkshims.ml 1970-01-01 01:00:00.000000000 +0100 +++ new/ocaml-gen-0.5.3/src/mkshims.ml 2019-11-04 08:56:10.000000000 +0100 @@ -0,0 +1,16 @@ +module C = Configurator.V1 + +let write_file f s = + let out = open_out f in + output_string out s; flush out; close_out out + +let shims_pre_407 = "module Stdlib = Pervasives" + +let shims_post_407 = "module Stdlib = Stdlib" + +let () = + C.main ~name:"mkshims" (fun c -> + let version = C.ocaml_config_var_exn c "version" in + let major, minor = Scanf.sscanf version "%u.%u" (fun maj min -> maj, min) in + write_file "GenShims_.ml" (if (major, minor) >= (4,7) then shims_post_407 else shims_pre_407); + )
