commit
630e42f490
|
@ -21,6 +21,8 @@ next
|
||||||
- `-j` now defaults to the number of processing units available rather
|
- `-j` now defaults to the number of processing units available rather
|
||||||
4 (#726, @diml)
|
4 (#726, @diml)
|
||||||
|
|
||||||
|
- Fix attaching index.mld to documentation (#731, fixes #717 @rgrinberg)
|
||||||
|
|
||||||
1.0+beta20 (10/04/2018)
|
1.0+beta20 (10/04/2018)
|
||||||
-----------------------
|
-----------------------
|
||||||
|
|
||||||
|
|
|
@ -433,7 +433,8 @@ module Gen (S : sig val sctx : SC.t end) = struct
|
||||||
|
|
||||||
let check_mlds_no_dupes ~pkg ~mlds =
|
let check_mlds_no_dupes ~pkg ~mlds =
|
||||||
match
|
match
|
||||||
List.map mlds ~f:(fun mld -> (Path.basename mld, mld))
|
List.map mlds ~f:(fun mld ->
|
||||||
|
(Filename.chop_extension (Path.basename mld), mld))
|
||||||
|> String.Map.of_list
|
|> String.Map.of_list
|
||||||
with
|
with
|
||||||
| Ok m -> m
|
| Ok m -> m
|
||||||
|
|
|
@ -89,12 +89,14 @@ end
|
||||||
|
|
||||||
let exclusions =
|
let exclusions =
|
||||||
let open Test in
|
let open Test in
|
||||||
|
let odoc = make ~external_deps:true ~skip_ocaml:"4.02.3" in
|
||||||
[ make "js_of_ocaml" ~external_deps:true ~js:true ~env:("NODE", "${bin:node}")
|
[ make "js_of_ocaml" ~external_deps:true ~js:true ~env:("NODE", "${bin:node}")
|
||||||
; make "github25" ~env:("OCAMLPATH", "./findlib-packages")
|
; make "github25" ~env:("OCAMLPATH", "./findlib-packages")
|
||||||
; make "odoc" ~external_deps:true ~skip_ocaml:"4.02.3"
|
; odoc "odoc"
|
||||||
; make "multiple-private-libs" ~external_deps:true ~skip_ocaml:"4.02.3"
|
; odoc "odoc-unique-mlds"
|
||||||
|
; odoc "github717-odoc-index"
|
||||||
|
; odoc "multiple-private-libs"
|
||||||
; make "ppx-rewriter" ~skip_ocaml:"4.02.3" ~external_deps:true
|
; make "ppx-rewriter" ~skip_ocaml:"4.02.3" ~external_deps:true
|
||||||
; make "odoc-unique-mlds" ~skip_ocaml:"4.02.3" ~external_deps:true
|
|
||||||
; make "output-obj" ~skip_platforms:[Mac; Win] ~skip_ocaml:"<4.06.0"
|
; make "output-obj" ~skip_platforms:[Mac; Win] ~skip_ocaml:"<4.06.0"
|
||||||
; make "github644" ~external_deps:true
|
; make "github644" ~external_deps:true
|
||||||
; make "private-public-overlap" ~external_deps:true
|
; make "private-public-overlap" ~external_deps:true
|
||||||
|
|
|
@ -170,6 +170,17 @@
|
||||||
test-cases/github660
|
test-cases/github660
|
||||||
(progn (run ${exe:cram.exe} -test run.t) (diff? run.t run.t.corrected))))))
|
(progn (run ${exe:cram.exe} -test run.t) (diff? run.t run.t.corrected))))))
|
||||||
|
|
||||||
|
(alias
|
||||||
|
((name github717-odoc-index)
|
||||||
|
(deps
|
||||||
|
((package jbuilder) (files_recursively_in test-cases/github717-odoc-index)))
|
||||||
|
(action
|
||||||
|
(chdir
|
||||||
|
test-cases/github717-odoc-index
|
||||||
|
(progn
|
||||||
|
(run ${exe:cram.exe} -skip-versions 4.02.3 -test run.t)
|
||||||
|
(diff? run.t run.t.corrected))))))
|
||||||
|
|
||||||
(alias
|
(alias
|
||||||
((name include-loop)
|
((name include-loop)
|
||||||
(deps ((package jbuilder) (files_recursively_in test-cases/include-loop)))
|
(deps ((package jbuilder) (files_recursively_in test-cases/include-loop)))
|
||||||
|
@ -454,6 +465,7 @@
|
||||||
(alias github597)
|
(alias github597)
|
||||||
(alias github644)
|
(alias github644)
|
||||||
(alias github660)
|
(alias github660)
|
||||||
|
(alias github717-odoc-index)
|
||||||
(alias include-loop)
|
(alias include-loop)
|
||||||
(alias inline_tests)
|
(alias inline_tests)
|
||||||
(alias installable-dup-private-libs)
|
(alias installable-dup-private-libs)
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
Test index.
|
|
@ -0,0 +1,8 @@
|
||||||
|
(jbuild_version 1)
|
||||||
|
|
||||||
|
(library
|
||||||
|
((name hello_world)
|
||||||
|
(public_name hello_world)
|
||||||
|
(libraries ())))
|
||||||
|
|
||||||
|
(documentation ())
|
|
@ -0,0 +1 @@
|
||||||
|
$ jbuilder build @doc
|
Loading…
Reference in New Issue