Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename JBUILDER_GEN to DUNE_GEN #958

Merged
merged 2 commits into from
Jul 6, 2018
Merged

Rename JBUILDER_GEN to DUNE_GEN #958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8bd8ff
Rename JBUILDER_GEN to DUNE_GEN
rgrinberg Jul 6, 2018
35f1119
Merge branch 'master' into dune-gen-meta
rgrinberg Jul 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions doc/migration.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,3 +179,9 @@ Removed Variables
-----------------

``${path-no-dep:file}`` has been removed.


``# JBUILDER_GEN`` renamed
--------------------------

``# DUNE_GEN`` should be used instead of ``# JBUILDER_GEN`` in META templates.
5 changes: 3 additions & 2 deletions src/install_rules.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ module Gen(P : Install_params) = struct
let template =
Build.if_file_exists meta_template
~then_:(Build.lines_of meta_template)
~else_:(Build.return ["# JBUILDER_GEN"])
~else_:(Build.return ["# DUNE_GEN"])
in
let meta_contents =
version >>^ fun version ->
Expand All @@ -123,7 +123,8 @@ module Gen(P : Install_params) = struct
String.extract_blank_separated_words
(String.sub s ~pos:1 ~len:(String.length s - 1))
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
else
Format.fprintf ppf "%s@," s);
Expand Down