Mailinglist Archive: opensuse-commit (1903 mails)

< Previous Next >
commit ocaml-dune for openSUSE:Factory
Hello community,

here is the log from the commit of package ocaml-dune for openSUSE:Factory
checked in at 2019-04-12 09:15:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocaml-dune (Old)
and /work/SRC/openSUSE:Factory/.ocaml-dune.new.27019 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ocaml-dune"

Fri Apr 12 09:15:36 2019 rev:9 rq:693169 version:1.9.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/ocaml-dune/ocaml-dune.changes 2019-04-11
08:48:06.616548960 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml-dune.new.27019/ocaml-dune.changes
2019-04-12 09:15:38.481722695 +0200
@@ -1,0 +2,8 @@
+Thu Apr 11 10:32:52 UTC 2019 - Andy <andy@xxxxxxxxxxxxxx>
+
+- Update to version 1.9.1:
+ * Fix invocation of odoc to add previously missing include paths,
+ impacting mld files that are not in directories containing
+ libraries.
+
+-------------------------------------------------------------------

Old:
----
ocaml-dune-1.9.0.tar.xz

New:
----
ocaml-dune-1.9.1.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ocaml-dune.spec ++++++
--- /var/tmp/diff_new_pack.LJMzB2/_old 2019-04-12 09:15:39.329723208 +0200
+++ /var/tmp/diff_new_pack.LJMzB2/_new 2019-04-12 09:15:39.329723208 +0200
@@ -17,7 +17,7 @@


Name: ocaml-dune
-Version: 1.9.0
+Version: 1.9.1
Release: 0
%{?ocaml_preserve_bytecode}
Summary: A composable build system for OCaml

++++++ _service ++++++
--- /var/tmp/diff_new_pack.LJMzB2/_old 2019-04-12 09:15:39.377723237 +0200
+++ /var/tmp/diff_new_pack.LJMzB2/_new 2019-04-12 09:15:39.377723237 +0200
@@ -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.9.0</param>
+ <param name="revision">1.9.1</param>
<param name="filename">ocaml-dune</param>
</service>
<service name="recompress" mode="disabled">

++++++ ocaml-dune-1.9.0.tar.xz -> ocaml-dune-1.9.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-dune-1.9.0/CHANGES.md
new/ocaml-dune-1.9.1/CHANGES.md
--- old/ocaml-dune-1.9.0/CHANGES.md 2019-04-09 14:49:48.000000000 +0200
+++ new/ocaml-dune-1.9.1/CHANGES.md 2019-04-11 06:25:21.000000000 +0200
@@ -1,3 +1,10 @@
+1.9.1 (11/04/2019)
+------------------
+
+- Fix invocation of odoc to add previously missing include paths, impacting
+ mld files that are not in directories containing libraries (#2016, fixes
+ #2007, @jonludlam)
+
1.9.0 (09/04/2019)
------------------

diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-dune-1.9.0/src/dep.ml
new/ocaml-dune-1.9.1/src/dep.ml
--- old/ocaml-dune-1.9.0/src/dep.ml 2019-04-09 14:49:48.000000000 +0200
+++ new/ocaml-dune-1.9.1/src/dep.ml 2019-04-11 06:25:21.000000000 +0200
@@ -1,5 +1,9 @@
open Stdune

+module Trace = struct
+ type t = (string * Digest.t) list
+end
+
module T = struct
type t =
| Env of Env.Var.t
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-dune-1.9.0/src/dep.mli
new/ocaml-dune-1.9.1/src/dep.mli
--- old/ocaml-dune-1.9.0/src/dep.mli 2019-04-09 14:49:48.000000000 +0200
+++ new/ocaml-dune-1.9.1/src/dep.mli 2019-04-11 06:25:21.000000000 +0200
@@ -19,6 +19,10 @@

type eval_pred = File_selector.t -> Path.Set.t

+module Trace : sig
+ type t
+end
+
module Set : sig
include Set.S with type elt = t

@@ -32,7 +36,7 @@

val encode : t -> Dune_lang.t

- val trace : t -> env:Env.t -> eval_pred:eval_pred -> (string * Digest.t) list
+ val trace : t -> env:Env.t -> eval_pred:eval_pred -> Trace.t

val add_paths : t -> Path.Set.t -> t

diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-dune-1.9.0/src/dune_file.ml
new/ocaml-dune-1.9.1/src/dune_file.ml
--- old/ocaml-dune-1.9.0/src/dune_file.ml 2019-04-09 14:49:48.000000000
+0200
+++ new/ocaml-dune-1.9.1/src/dune_file.ml 2019-04-11 06:25:21.000000000
+0200
@@ -99,8 +99,11 @@
"You cannot declare items to be installed without \
adding a <package>.opam file at the root of your project.\n\
To declare elements to be installed as part of package %S, \
- add a %S file at the root of your project."
- name_s (Package.Name.opam_fn name))
+ add a %S file at the root of your project.\nn\
+ Root of the project as discovered by dune: %s@"
+ name_s (Package.Name.opam_fn name)
+ (Path.to_string_maybe_quoted
+ (Dune_project.in_source_root project)))
else
Error (sprintf
"The current scope doesn't define package %S.\n\
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-dune-1.9.0/src/dune_project.ml
new/ocaml-dune-1.9.1/src/dune_project.ml
--- old/ocaml-dune-1.9.0/src/dune_project.ml 2019-04-09 14:49:48.000000000
+0200
+++ new/ocaml-dune-1.9.1/src/dune_project.ml 2019-04-11 06:25:21.000000000
+0200
@@ -650,3 +650,6 @@

let set_parsing_context t parser =
Dune_lang.Decoder.set_many t.parsing_context parser
+
+let in_source_root t =
+ Path.append_local Path.root (root t)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-dune-1.9.0/src/dune_project.mli
new/ocaml-dune-1.9.1/src/dune_project.mli
--- old/ocaml-dune-1.9.0/src/dune_project.mli 2019-04-09 14:49:48.000000000
+0200
+++ new/ocaml-dune-1.9.1/src/dune_project.mli 2019-04-11 06:25:21.000000000
+0200
@@ -135,3 +135,5 @@
val dune_version : t -> Syntax.Version.t

val pp : t Fmt.t
+
+val in_source_root : t -> Path.t
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-dune-1.9.0/src/file_binding.ml
new/ocaml-dune-1.9.1/src/file_binding.ml
--- old/ocaml-dune-1.9.0/src/file_binding.ml 2019-04-09 14:49:48.000000000
+0200
+++ new/ocaml-dune-1.9.1/src/file_binding.ml 2019-04-11 06:25:21.000000000
+0200
@@ -6,7 +6,7 @@
}

module Expanded = struct
- type nonrec t = (Loc.t * Path.t, Loc.t * string) t
+ type nonrec t = (Loc.t * Path.t, Loc.t * Path.Local.t) t

let src t = snd t.src
let dst t = Option.map ~f:snd t.dst
@@ -21,9 +21,10 @@
let basename = Path.basename src in
String.drop_suffix basename ~suffix:".exe"
|> Option.value ~default:basename
+ |> Path.Local.of_string

let dst_path t ~dir =
- Path.relative dir (dst_basename t)
+ Path.append_local dir (dst_basename t)
end

module Unexpanded = struct
@@ -43,7 +44,12 @@
(loc, Path.relative dir expanded)
in
{ src
- ; dst = Option.map ~f t.dst
+ ; dst =
+ let f sw =
+ let (loc, p) = f sw in
+ (loc, Path.Local.of_string p)
+ in
+ Option.map ~f t.dst
}

module L = struct
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-dune-1.9.0/src/file_binding.mli
new/ocaml-dune-1.9.1/src/file_binding.mli
--- old/ocaml-dune-1.9.0/src/file_binding.mli 2019-04-09 14:49:48.000000000
+0200
+++ new/ocaml-dune-1.9.1/src/file_binding.mli 2019-04-11 06:25:21.000000000
+0200
@@ -4,7 +4,7 @@
type t

val src : t -> Path.t
- val dst : t -> string option
+ val dst : t -> Path.Local.t option

val src_loc : t -> Loc.t

diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-dune-1.9.0/src/install_rules.ml
new/ocaml-dune-1.9.1/src/install_rules.ml
--- old/ocaml-dune-1.9.0/src/install_rules.ml 2019-04-09 14:49:48.000000000
+0200
+++ new/ocaml-dune-1.9.1/src/install_rules.ml 2019-04-11 06:25:21.000000000
+0200
@@ -365,7 +365,8 @@
List.map files ~f:(fun fb ->
let loc = File_binding.Expanded.src_loc fb in
let src = File_binding.Expanded.src fb in
- let dst = File_binding.Expanded.dst fb in
+ let dst = Option.map ~f:Path.Local.to_string
+ (File_binding.Expanded.dst fb) in
( Some loc
, Install.Entry.make section src ?dst
)))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-dune-1.9.0/src/odoc.ml
new/ocaml-dune-1.9.1/src/odoc.ml
--- old/ocaml-dune-1.9.0/src/odoc.ml 2019-04-09 14:49:48.000000000 +0200
+++ new/ocaml-dune-1.9.1/src/odoc.ml 2019-04-11 06:25:21.000000000 +0200
@@ -71,10 +71,17 @@

let alias = Alias.make ".odoc-all"

- let deps ctx requires =
+ let deps ctx pkg requires =
Build.of_result_map requires ~f:(fun libs ->
Build.deps (
- List.fold_left libs ~init:Dep.Set.empty ~f:(fun acc (lib : Lib.t) ->
+ let init =
+ match pkg with
+ | Some p ->
+ Dep.Set.singleton
+ (Dep.alias (alias ~dir:(Paths.odocs ctx (Pkg p))))
+ | None -> Dep.Set.empty
+ in
+ List.fold_left libs ~init ~f:(fun acc (lib : Lib.t) ->
if Lib.is_local lib then
let dir = Paths.odocs ctx (Lib lib) in
let alias = alias ~dir in
@@ -156,7 +163,7 @@
]);
odoc_file

-let odoc_include_flags ctx requires =
+let odoc_include_flags ctx pkg requires =
Arg_spec.of_result_map requires ~f:(fun libs ->
let paths =
libs |> List.fold_left ~f:(fun paths lib ->
@@ -166,12 +173,17 @@
paths
)
) ~init:Path.Set.empty in
+ let paths =
+ match pkg with
+ | Some p -> Path.Set.add paths (Paths.odocs ctx (Pkg p))
+ | None -> paths
+ in
Arg_spec.S (List.concat_map (Path.Set.to_list paths)
~f:(fun dir -> [Arg_spec.A "-I"; Path dir])))

-let setup_html sctx (odoc_file : odoc) ~requires =
+let setup_html sctx (odoc_file : odoc) ~pkg ~requires =
let ctx = Super_context.context sctx in
- let deps = Dep.deps ctx requires in
+ let deps = Dep.deps ctx pkg requires in
let to_remove, dune_keep =
match odoc_file.source with
| Mld -> odoc_file.html_file, []
@@ -189,7 +201,7 @@
:: Build.run ~dir:(Paths.html_root ctx)
(odoc sctx)
[ A "html"
- ; odoc_include_flags ctx requires
+ ; odoc_include_flags ctx pkg requires
; A "-o"; Path (Paths.html_root ctx)
; Dep odoc_file.odoc_input
; Hidden_targets [odoc_file.html_file]
@@ -206,8 +218,8 @@
let pkg_or_lnu = pkg_or_lnu lib in
let ctx = Super_context.context sctx in
let doc_dir = Paths.odocs ctx (Lib lib) in
- let odoc_include_flags = odoc_include_flags ctx requires in
- let includes = (Dep.deps ctx requires, odoc_include_flags) in
+ let odoc_include_flags = odoc_include_flags ctx (Lib.package lib) requires in
+ let includes = (Dep.deps ctx (Lib.package lib) requires, odoc_include_flags)
in
let modules_and_odoc_files =
List.map (Module.Name.Map.values modules) ~f:(
compile_module sctx ~includes ~dep_graphs
@@ -353,7 +365,8 @@
let f (sctx, lib, requires) =
let ctx = Super_context.context sctx in
let odocs = odocs ctx (Lib lib) in
- List.iter odocs ~f:(setup_html sctx ~requires);
+ let pkg = Lib.package lib in
+ List.iter odocs ~f:(setup_html sctx ~pkg ~requires);
let html_files = List.map ~f:(fun o -> o.html_file) odocs in
let static_html = static_html ctx in
Build_system.Alias.add_deps (Dep.html_alias ctx (Lib lib))
@@ -408,7 +421,7 @@
let ctx = Super_context.context sctx in
List.iter libs ~f:(setup_lib_html_rules sctx ~requires);
let pkg_odocs = odocs ctx (Pkg pkg) in
- List.iter pkg_odocs ~f:(setup_html sctx ~requires);
+ List.iter pkg_odocs ~f:(setup_html sctx ~pkg:(Some pkg) ~requires);
let odocs =
List.concat (
pkg_odocs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-dune-1.9.0/src/stdune/path.mli
new/ocaml-dune-1.9.1/src/stdune/path.mli
--- old/ocaml-dune-1.9.0/src/stdune/path.mli 2019-04-09 14:49:48.000000000
+0200
+++ new/ocaml-dune-1.9.1/src/stdune/path.mli 2019-04-11 06:25:21.000000000
+0200
@@ -6,6 +6,7 @@
val to_sexp : t -> Sexp.t
val equal : t -> t -> bool
val to_string : t -> string
+ val of_string : ?error_loc:Loc0.t -> string -> t
val pp : Format.formatter -> t -> unit
module L : sig
val relative : ?error_loc:Loc0.t -> t -> string list -> t
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-dune-1.9.0/test/blackbox-tests/dune.inc
new/ocaml-dune-1.9.1/test/blackbox-tests/dune.inc
--- old/ocaml-dune-1.9.0/test/blackbox-tests/dune.inc 2019-04-09
14:49:48.000000000 +0200
+++ new/ocaml-dune-1.9.1/test/blackbox-tests/dune.inc 2019-04-11
06:25:21.000000000 +0200
@@ -993,6 +993,16 @@
(diff? run.t run.t.corrected)))))

(alias
+ (name odoc-package-mld-link)
+ (deps (package dune) (source_tree test-cases/odoc-package-mld-link))
+ (action
+ (chdir
+ test-cases/odoc-package-mld-link
+ (progn
+ (run %{exe:cram.exe} -skip-versions 4.02.3 -test run.t)
+ (diff? run.t run.t.corrected)))))
+
+(alias
(name odoc-unique-mlds)
(deps (package dune) (source_tree test-cases/odoc-unique-mlds))
(action
@@ -1498,6 +1508,7 @@
(alias ocamldep-multi-stanzas)
(alias ocamllex-jbuild)
(alias odoc)
+ (alias odoc-package-mld-link)
(alias odoc-unique-mlds)
(alias old-dune-subsystem)
(alias optional)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-dune-1.9.0/test/blackbox-tests/gen_tests.ml
new/ocaml-dune-1.9.1/test/blackbox-tests/gen_tests.ml
--- old/ocaml-dune-1.9.0/test/blackbox-tests/gen_tests.ml 2019-04-09
14:49:48.000000000 +0200
+++ new/ocaml-dune-1.9.1/test/blackbox-tests/gen_tests.ml 2019-04-11
06:25:21.000000000 +0200
@@ -128,6 +128,7 @@
; make "coq" ~external_deps:true ~coq:true
; make "github25" ~env:("OCAMLPATH", Dune_lang.atom "./findlib-packages")
; odoc "odoc"
+ ; odoc "odoc-package-mld-link"
; odoc "odoc-unique-mlds"
; odoc "github717-odoc-index"
; odoc "multiple-private-libs"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ocaml-dune-1.9.0/test/blackbox-tests/test-cases/odoc/run.t
new/ocaml-dune-1.9.1/test/blackbox-tests/test-cases/odoc/run.t
--- old/ocaml-dune-1.9.0/test/blackbox-tests/test-cases/odoc/run.t
2019-04-09 14:49:48.000000000 +0200
+++ new/ocaml-dune-1.9.1/test/blackbox-tests/test-cases/odoc/run.t
2019-04-11 06:25:21.000000000 +0200
@@ -1,13 +1,13 @@
$ dune build @doc --display short
ocamldep .bar.objs/bar.ml.d
ocamlc .bar.objs/byte/bar.{cmi,cmo,cmt}
- odoc _doc/_odoc/lib/bar/bar.odoc
- odoc _doc/_html/bar/Bar/.dune-keep,_doc/_html/bar/Bar/index.html
odoc _doc/_odoc/pkg/bar/page-index.odoc
+ odoc _doc/_odoc/lib/bar/bar.odoc
odoc _doc/_html/bar/index.html
odoc _doc/_html/highlight.pack.js,_doc/_html/odoc.css
ocamldep .foo.objs/foo.ml.d
ocamlc .foo.objs/byte/foo.{cmi,cmo,cmt}
+ odoc _doc/_odoc/pkg/foo/page-index.odoc
odoc _doc/_odoc/lib/foo/foo.odoc
ocamldep .foo.objs/foo2.ml.d
ocamlc .foo.objs/byte/foo2.{cmi,cmo,cmt}
@@ -19,9 +19,9 @@
ocamlc .foo_byte.objs/byte/foo_byte.{cmi,cmo,cmt}
odoc _doc/_odoc/lib/foo.byte/foo_byte.odoc
odoc _doc/_html/foo/Foo2/.dune-keep,_doc/_html/foo/Foo2/index.html
- odoc _doc/_odoc/pkg/foo/page-index.odoc
- odoc _doc/_html/foo/index.html
+ odoc _doc/_html/bar/Bar/.dune-keep,_doc/_html/bar/Bar/index.html
odoc
_doc/_html/foo/Foo_byte/.dune-keep,_doc/_html/foo/Foo_byte/index.html
+ odoc _doc/_html/foo/index.html
odoc _doc/_html/foo/Foo/.dune-keep,_doc/_html/foo/Foo/index.html
$ dune runtest --display short
<!DOCTYPE html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ocaml-dune-1.9.0/test/blackbox-tests/test-cases/odoc-package-mld-link/dune
new/ocaml-dune-1.9.1/test/blackbox-tests/test-cases/odoc-package-mld-link/dune
---
old/ocaml-dune-1.9.0/test/blackbox-tests/test-cases/odoc-package-mld-link/dune
1970-01-01 01:00:00.000000000 +0100
+++
new/ocaml-dune-1.9.1/test/blackbox-tests/test-cases/odoc-package-mld-link/dune
2019-04-11 06:25:21.000000000 +0200
@@ -0,0 +1 @@
+(documentation)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ocaml-dune-1.9.0/test/blackbox-tests/test-cases/odoc-package-mld-link/dune-project

new/ocaml-dune-1.9.1/test/blackbox-tests/test-cases/odoc-package-mld-link/dune-project
---
old/ocaml-dune-1.9.0/test/blackbox-tests/test-cases/odoc-package-mld-link/dune-project
1970-01-01 01:00:00.000000000 +0100
+++
new/ocaml-dune-1.9.1/test/blackbox-tests/test-cases/odoc-package-mld-link/dune-project
2019-04-11 06:25:21.000000000 +0200
@@ -0,0 +1,2 @@
+(lang dune 1.5)
+(name ocaml-labs)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ocaml-dune-1.9.0/test/blackbox-tests/test-cases/odoc-package-mld-link/index.mld

new/ocaml-dune-1.9.1/test/blackbox-tests/test-cases/odoc-package-mld-link/index.mld
---
old/ocaml-dune-1.9.0/test/blackbox-tests/test-cases/odoc-package-mld-link/index.mld
1970-01-01 01:00:00.000000000 +0100
+++
new/ocaml-dune-1.9.1/test/blackbox-tests/test-cases/odoc-package-mld-link/index.mld
2019-04-11 06:25:21.000000000 +0200
@@ -0,0 +1,4 @@
+{0 Big title}
+
+Let's test a link to {{!page-otherpage}Other page} and see if it works.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ocaml-dune-1.9.0/test/blackbox-tests/test-cases/odoc-package-mld-link/otherpage.mld

new/ocaml-dune-1.9.1/test/blackbox-tests/test-cases/odoc-package-mld-link/otherpage.mld
---
old/ocaml-dune-1.9.0/test/blackbox-tests/test-cases/odoc-package-mld-link/otherpage.mld
1970-01-01 01:00:00.000000000 +0100
+++
new/ocaml-dune-1.9.1/test/blackbox-tests/test-cases/odoc-package-mld-link/otherpage.mld
2019-04-11 06:25:21.000000000 +0200
@@ -0,0 +1,4 @@
+{0 The other page}
+
+This is the other page. Congratulations!
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ocaml-dune-1.9.0/test/blackbox-tests/test-cases/odoc-package-mld-link/run.t
new/ocaml-dune-1.9.1/test/blackbox-tests/test-cases/odoc-package-mld-link/run.t
---
old/ocaml-dune-1.9.0/test/blackbox-tests/test-cases/odoc-package-mld-link/run.t
1970-01-01 01:00:00.000000000 +0100
+++
new/ocaml-dune-1.9.1/test/blackbox-tests/test-cases/odoc-package-mld-link/run.t
2019-04-11 06:25:21.000000000 +0200
@@ -0,0 +1,10 @@
+Make sure that links between mld files are resolved even when there is
+no library associated with the project
+
+This test case is based on code provided by @vphantom, ocaml/dune#2007
+
+ $ dune build _doc/_html/odoc_page_link_bug/index.html
+
+ $ grep -r xref-unresolved
_build/default/_doc/_html/odoc_page_link_bug/index.html
+ [1]
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ocaml-dune-1.9.0/test/blackbox-tests/test-cases/odoc-unique-mlds/run.t
new/ocaml-dune-1.9.1/test/blackbox-tests/test-cases/odoc-unique-mlds/run.t
--- old/ocaml-dune-1.9.0/test/blackbox-tests/test-cases/odoc-unique-mlds/run.t
2019-04-09 14:49:48.000000000 +0200
+++ new/ocaml-dune-1.9.1/test/blackbox-tests/test-cases/odoc-unique-mlds/run.t
2019-04-11 06:25:21.000000000 +0200
@@ -3,11 +3,11 @@
Entering directory 'same-scope'
odoc _doc/_html/highlight.pack.js,_doc/_html/odoc.css
ocamlc lib1/.root_lib1.objs/byte/root_lib1.{cmi,cmo,cmt}
+ odoc _doc/_odoc/pkg/root/page-index.odoc
odoc _doc/_odoc/lib/root.lib1/root_lib1.odoc
ocamlc lib2/.root_lib2.objs/byte/root_lib2.{cmi,cmo,cmt}
odoc _doc/_odoc/lib/root.lib2/root_lib2.odoc
odoc
_doc/_html/root/Root_lib2/.dune-keep,_doc/_html/root/Root_lib2/index.html
- odoc _doc/_odoc/pkg/root/page-index.odoc
odoc _doc/_html/root/index.html
odoc
_doc/_html/root/Root_lib1/.dune-keep,_doc/_html/root/Root_lib1/index.html

@@ -17,12 +17,12 @@
Entering directory 'diff-scope'
odoc _doc/_html/highlight.pack.js,_doc/_html/odoc.css
ocamlc scope1/.scope1.objs/byte/scope1.{cmi,cmo,cmt}
- odoc _doc/_odoc/lib/scope1/scope1.odoc
- odoc
_doc/_html/scope1/Scope1/.dune-keep,_doc/_html/scope1/Scope1/index.html
odoc _doc/_odoc/pkg/scope1/page-index.odoc
+ odoc _doc/_odoc/lib/scope1/scope1.odoc
odoc _doc/_html/scope1/index.html
ocamlc scope2/.scope2.objs/byte/scope2.{cmi,cmo,cmt}
- odoc _doc/_odoc/lib/scope2/scope2.odoc
- odoc
_doc/_html/scope2/Scope2/.dune-keep,_doc/_html/scope2/Scope2/index.html
odoc _doc/_odoc/pkg/scope2/page-index.odoc
+ odoc _doc/_odoc/lib/scope2/scope2.odoc
odoc _doc/_html/scope2/index.html
+ odoc
_doc/_html/scope1/Scope1/.dune-keep,_doc/_html/scope1/Scope1/index.html
+ odoc
_doc/_html/scope2/Scope2/.dune-keep,_doc/_html/scope2/Scope2/index.html


< Previous Next >
This Thread