Hello community,
here is the log from the commit of package ocaml-dune for openSUSE:Factory
checked in at 2019-03-13 16:41:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocaml-dune (Old)
and /work/SRC/openSUSE:Factory/.ocaml-dune.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-dune"
Wed Mar 13 16:41:40 2019 rev:7 rq:684544 version:1.8.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/ocaml-dune/ocaml-dune.changes 2019-03-10
09:39:21.876118923 +0100
+++ /work/SRC/openSUSE:Factory/.ocaml-dune.new.28833/ocaml-dune.changes
2019-03-13 16:41:40.238671273 +0100
@@ -1,0 +2,8 @@
+Wed Mar 13 07:18:27 UTC 2019 - Andy <a...@onthewings.net>
+
+- Update to version 1.8.2:
+ * Correctly write dune-package when version is empty string.
+ * Fix auto-generated index.mld. Use correct headings for the
+ listing.
+
+-------------------------------------------------------------------
Old:
----
ocaml-dune-1.8.0.tar.xz
New:
----
ocaml-dune-1.8.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ocaml-dune.spec ++++++
--- /var/tmp/diff_new_pack.4SRxwC/_old 2019-03-13 16:41:40.726670913 +0100
+++ /var/tmp/diff_new_pack.4SRxwC/_new 2019-03-13 16:41:40.726670913 +0100
@@ -17,7 +17,7 @@
Name: ocaml-dune
-Version: 1.8.0
+Version: 1.8.2
Release: 0
%{?ocaml_preserve_bytecode}
Summary: A composable build system for OCaml
++++++ _service ++++++
--- /var/tmp/diff_new_pack.4SRxwC/_old 2019-03-13 16:41:40.754670892 +0100
+++ /var/tmp/diff_new_pack.4SRxwC/_new 2019-03-13 16:41:40.754670892 +0100
@@ -3,7 +3,7 @@
<param name="url">git://github.com/ocaml/dune.git</param>
<param name="scm">git</param>
<param name="versionformat">@PARENT_TAG@</param>
- <param name="revision">1.8.0</param>
+ <param name="revision">1.8.2</param>
<param name="filename">ocaml-dune</param>
</service>
<service name="recompress" mode="disabled">
++++++ ocaml-dune-1.8.0.tar.xz -> ocaml-dune-1.8.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-dune-1.8.0/.travis-ci.sh
new/ocaml-dune-1.8.2/.travis-ci.sh
--- old/ocaml-dune-1.8.0/.travis-ci.sh 2019-03-07 16:43:57.000000000 +0100
+++ new/ocaml-dune-1.8.2/.travis-ci.sh 2019-03-10 02:24:36.000000000 +0100
@@ -5,6 +5,8 @@
OPAM_VERSION="2.0.3"
+ODOC="odoc.1.4.0"
+
TARGET="$1"; shift
case "$TARGET" in
@@ -50,7 +52,7 @@
opam init --disable-sandboxing
eval $(opam config env)
_boot/install/default/bin/dune runtest && \
- opam install ocamlfind utop ppxlib odoc menhir ocaml-migrate-parsetree
js_of_ocaml-ppx js_of_ocaml-compiler
+ opam install ocamlfind utop ppxlib $ODOC menhir
ocaml-migrate-parsetree js_of_ocaml-ppx js_of_ocaml-compiler
opam remove dune jbuilder \
`opam list --depends-on jbuilder --installed --short` \
`opam list --depends-on dune --installed --short`
@@ -89,7 +91,7 @@
./_boot/install/default/bin/dune build @runtest-no-deps &>
$RUNTEST_NO_DEPS
opam list
opam pin add dune . --no-action
- opam install ocamlfind utop ppxlib odoc ocaml-migrate-parsetree
js_of_ocaml-ppx js_of_ocaml-compiler
+ opam install ocamlfind utop ppxlib $ODOC ocaml-migrate-parsetree
js_of_ocaml-ppx js_of_ocaml-compiler
echo -en "travis_fold:end:opam.deps\r"
fi
echo -en "travis_fold:end:dune.boot\r"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-dune-1.8.0/CHANGES.md
new/ocaml-dune-1.8.2/CHANGES.md
--- old/ocaml-dune-1.8.0/CHANGES.md 2019-03-07 16:43:57.000000000 +0100
+++ new/ocaml-dune-1.8.2/CHANGES.md 2019-03-10 02:24:36.000000000 +0100
@@ -1,3 +1,15 @@
+1.8.2 (10/03/2019)
+------------------
+
+- Fix auto-generated `index.mld`. Use correct headings for the listing. (#1925,
+ @rgrinberg, @aantron)
+
+1.8.1 (08/03/2019)
+------------------
+
+- Correctly write `dune-package` when version is empty string (#1919, fix
#1918,
+ @rgrinberg)
+
1.8.0 (07/03/2019)
------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-dune-1.8.0/doc/quick-start.rst
new/ocaml-dune-1.8.2/doc/quick-start.rst
--- old/ocaml-dune-1.8.0/doc/quick-start.rst 2019-03-07 16:43:57.000000000
+0100
+++ new/ocaml-dune-1.8.2/doc/quick-start.rst 2019-03-10 02:24:36.000000000
+0100
@@ -201,13 +201,12 @@
(executable
(name discover)
- (libraries base stdio configurator))
+ (libraries dune.configurator))
as well as this ``discover.ml`` file:
.. code:: ocaml
-
module C = Configurator.V1
let () =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-dune-1.8.0/src/dune_lang/atom.ml
new/ocaml-dune-1.8.2/src/dune_lang/atom.ml
--- old/ocaml-dune-1.8.0/src/dune_lang/atom.ml 2019-03-07 16:43:57.000000000
+0100
+++ new/ocaml-dune-1.8.2/src/dune_lang/atom.ml 2019-03-10 02:24:36.000000000
+0100
@@ -2,8 +2,6 @@
type t = A of string [@@unboxed]
-let invalid_argf fmt = Printf.ksprintf invalid_arg fmt
-
let is_valid_dune =
let rec loop s i len =
i = len ||
@@ -42,13 +40,17 @@
| Syntax.Jbuild -> is_valid_jbuild t
| Dune -> is_valid_dune t
-let print ((A s) as t) syntax =
+let print ((A atom) as t) syntax =
if is_valid t syntax then
- s
+ atom
else
match syntax with
- | Jbuild -> invalid_argf "atom '%s' cannot be printed in jbuild syntax" s
- | Dune -> invalid_argf "atom '%s' cannot be in dune syntax" s
+ | Jbuild ->
+ Exn.code_error "atom cannot be printed in jbuild syntax"
+ ["atom", Sexp.Atom atom]
+ | Dune ->
+ Exn.code_error "atom cannot be printed in dune syntax"
+ ["atom", Sexp.Atom atom]
let of_int i = of_string (string_of_int i)
let of_float x = of_string (string_of_float x)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-dune-1.8.0/src/dune_package.ml
new/ocaml-dune-1.8.2/src/dune_package.ml
--- old/ocaml-dune-1.8.0/src/dune_package.ml 2019-03-07 16:43:57.000000000
+0100
+++ new/ocaml-dune-1.8.2/src/dune_package.ml 2019-03-10 02:24:36.000000000
+0100
@@ -229,7 +229,10 @@
match version with
| None -> sexp
| Some version ->
- sexp @ [List [Dune_lang.atom "version"; Dune_lang.atom version]]
+ sexp @ [ List [ Dune_lang.atom "version"
+ ; Dune_lang.atom_or_quoted_string version
+ ]
+ ]
in
let libs =
List.map libs ~f:(fun lib ->
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-dune-1.8.0/src/odoc.ml
new/ocaml-dune-1.8.2/src/odoc.ml
--- old/ocaml-dune-1.8.0/src/odoc.ml 2019-03-07 16:43:57.000000000 +0100
+++ new/ocaml-dune-1.8.2/src/odoc.ml 2019-03-10 02:24:36.000000000 +0100
@@ -415,13 +415,15 @@
))
|> Lib.Map.of_list_exn
- let default_index entry_modules =
+ let default_index ~(pkg : Package.t) entry_modules =
let b = Buffer.create 512 in
+ Printf.bprintf b "{0 %s index}\n"
+ (Package.Name.to_string pkg.name);
Lib.Map.to_list entry_modules
|> List.sort ~compare:(fun (x, _) (y, _) ->
Lib_name.compare (Lib.name x) (Lib.name y))
|> List.iter ~f:(fun (lib, modules) ->
- Printf.bprintf b "{2 Library %s}\n" (Lib_name.to_string (Lib.name lib));
+ Printf.bprintf b "{1 Library %s}\n" (Lib_name.to_string (Lib.name lib));
Buffer.add_string b (
match modules with
| [ x ] ->
@@ -462,7 +464,7 @@
else
let entry_modules = entry_modules ~pkg in
let gen_mld = Paths.gen_mld_dir pkg ++ "index.mld" in
- add_rule (Build.write_file gen_mld (default_index entry_modules));
+ add_rule (Build.write_file gen_mld (default_index ~pkg entry_modules));
String.Map.add mlds "index" gen_mld in
let odocs = List.map (String.Map.values mlds) ~f:(fun mld ->
compile_mld
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ocaml-dune-1.8.0/test/blackbox-tests/test-cases/github717-odoc-index/index.mld
new/ocaml-dune-1.8.2/test/blackbox-tests/test-cases/github717-odoc-index/index.mld
---
old/ocaml-dune-1.8.0/test/blackbox-tests/test-cases/github717-odoc-index/index.mld
2019-03-07 16:43:57.000000000 +0100
+++
new/ocaml-dune-1.8.2/test/blackbox-tests/test-cases/github717-odoc-index/index.mld
2019-03-10 02:24:36.000000000 +0100
@@ -1 +1 @@
-Test index.
\ No newline at end of file
+{0 Test index}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ocaml-dune-1.8.0/test/blackbox-tests/test-cases/odoc/run.t
new/ocaml-dune-1.8.2/test/blackbox-tests/test-cases/odoc/run.t
--- old/ocaml-dune-1.8.0/test/blackbox-tests/test-cases/odoc/run.t
2019-03-07 16:43:57.000000000 +0100
+++ new/ocaml-dune-1.8.2/test/blackbox-tests/test-cases/odoc/run.t
2019-03-10 02:24:36.000000000 +0100
@@ -43,14 +43,16 @@
</html>
$ dune build @foo-mld --display short
- {2 Library foo}
+ {0 foo index}
+ {1 Library foo}
This library exposes the following toplevel modules:
{!modules:Foo Foo2}
- {2 Library foo.byte}
+ {1 Library foo.byte}
The entry point of this library is the module:
{!module-Foo_byte}.
$ dune build @bar-mld --display short
- {2 Library bar}
+ {0 bar index}
+ {1 Library bar}
The entry point of this library is the module:
{!module-Bar}.
