matthieu
/
dune
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename typ to source 

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
This commit is contained in:
Rudi Grinberg 2018-06-07 14:28:25 +07:00
parent 51ec4a0dc6
commit c842c76036
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/odoc.ml
View File

@ -22,13 +22,13 @@ type target =
| Lib of Lib.t | Lib of Lib.t
| Pkg of Package.Name.t | Pkg of Package.Name.t
type typ = Module | Mld type source = Module | Mld
type odoc = type odoc =
{ odoc_input: Path.t { odoc_input: Path.t
; html_dir: Path.t ; html_dir: Path.t
; html_file: Path.t ; html_file: Path.t
; typ: typ ; source: source
} }
module Gen (S : sig val sctx : SC.t end) = struct module Gen (S : sig val sctx : SC.t end) = struct
@ -163,7 +163,7 @@ module Gen (S : sig val sctx : SC.t end) = struct
let setup_html (odoc_file : odoc) ~requires = let setup_html (odoc_file : odoc) ~requires =
let deps = Dep.deps requires in let deps = Dep.deps requires in
let to_remove, jbuilder_keep = let to_remove, jbuilder_keep =
match odoc_file.typ with match odoc_file.source with
| Mld -> odoc_file.html_file, [] | Mld -> odoc_file.html_file, []
| Module -> | Module ->
let jbuilder_keep = let jbuilder_keep =
@ -283,7 +283,7 @@ module Gen (S : sig val sctx : SC.t end) = struct
{ odoc_input { odoc_input
; html_dir ; html_dir
; html_file = html_dir ++ "index.html" ; html_file = html_dir ++ "index.html"
; typ = Module ; source = Module
} }
| Pkg _ -> | Pkg _ ->
{ odoc_input { odoc_input
@ -294,7 +294,7 @@ module Gen (S : sig val sctx : SC.t end) = struct
|> String.drop_prefix ~prefix:"page-" |> String.drop_prefix ~prefix:"page-"
|> Option.value_exn |> Option.value_exn
) )
; typ = Mld ; source = Mld
} }
let static_html = [ css_file; toplevel_index ] let static_html = [ css_file; toplevel_index ]