Merge pull request #958 from rgrinberg/dune-gen-meta
Rename JBUILDER_GEN to DUNE_GEN
This commit is contained in:
commit
19e332d8a4
|
@ -179,3 +179,9 @@ Removed Variables
|
||||||
-----------------
|
-----------------
|
||||||
|
|
||||||
``${path-no-dep:file}`` has been removed.
|
``${path-no-dep:file}`` has been removed.
|
||||||
|
|
||||||
|
|
||||||
|
``# JBUILDER_GEN`` renamed
|
||||||
|
--------------------------
|
||||||
|
|
||||||
|
``# DUNE_GEN`` should be used instead of ``# JBUILDER_GEN`` in META templates.
|
||||||
|
|
|
@ -102,7 +102,7 @@ module Gen(P : Install_params) = struct
|
||||||
let template =
|
let template =
|
||||||
Build.if_file_exists meta_template
|
Build.if_file_exists meta_template
|
||||||
~then_:(Build.lines_of meta_template)
|
~then_:(Build.lines_of meta_template)
|
||||||
~else_:(Build.return ["# JBUILDER_GEN"])
|
~else_:(Build.return ["# DUNE_GEN"])
|
||||||
in
|
in
|
||||||
let meta_contents =
|
let meta_contents =
|
||||||
version >>^ fun version ->
|
version >>^ fun version ->
|
||||||
|
@ -123,7 +123,8 @@ module Gen(P : Install_params) = struct
|
||||||
String.extract_blank_separated_words
|
String.extract_blank_separated_words
|
||||||
(String.sub s ~pos:1 ~len:(String.length s - 1))
|
(String.sub s ~pos:1 ~len:(String.length s - 1))
|
||||||
with
|
with
|
||||||
| ["JBUILDER_GEN"] -> Format.fprintf ppf "%a@," Meta.pp meta.entries
|
| ["JBUILDER_GEN" | "DUNE_GEN"] ->
|
||||||
|
Format.fprintf ppf "%a@," Meta.pp meta.entries
|
||||||
| _ -> Format.fprintf ppf "%s@," s
|
| _ -> Format.fprintf ppf "%s@," s
|
||||||
else
|
else
|
||||||
Format.fprintf ppf "%s@," s);
|
Format.fprintf ppf "%s@," s);
|
||||||
|
|
Loading…
Reference in New Issue