aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis Rascão <[email protected]>2017-10-19 05:24:37 +0100
committerTristan Sloughter <[email protected]>2017-10-18 21:24:37 -0700
commit88598b2f166849cd87ab102dcbab4497458b70cd (patch)
tree87e73e9b05334538221571a9679182ebc6bb7c02
parent9855022433c9e3e08850c13b925b94f3b87df6c3 (diff)
downloadrelx-88598b2f166849cd87ab102dcbab4497458b70cd.tar.gz
relx-88598b2f166849cd87ab102dcbab4497458b70cd.tar.bz2
relx-88598b2f166849cd87ab102dcbab4497458b70cd.zip
Add `erts_dir` overlay var (#614)
Useful for copying custom files from an erts build such as a .kerl.config file.
-rw-r--r--src/rlx_prv_overlay.erl1
-rw-r--r--test/rlx_release_SUITE.erl4
2 files changed, 4 insertions, 1 deletions
diff --git a/src/rlx_prv_overlay.erl b/src/rlx_prv_overlay.erl
index dc57326..a18699a 100644
--- a/src/rlx_prv_overlay.erl
+++ b/src/rlx_prv_overlay.erl
@@ -245,6 +245,7 @@ render_overlay_vars(_OverlayVars, [], Acc) ->
-spec generate_release_vars(rlx_release:t()) -> proplists:proplist().
generate_release_vars(Release) ->
[{erts_vsn, rlx_release:erts(Release)},
+ {erts_dir, code:root_dir()},
{release_erts_version, rlx_release:erts(Release)},
{release_name, rlx_release:name(Release)},
{rel_vsn, rlx_release:vsn(Release)},
diff --git a/test/rlx_release_SUITE.erl b/test/rlx_release_SUITE.erl
index c9430fd..cfabc24 100644
--- a/test/rlx_release_SUITE.erl
+++ b/test/rlx_release_SUITE.erl
@@ -676,7 +676,8 @@ overlay_release(Config) ->
{template, Template,
"{{target_dir}}/test_template_resolved"},
{template, Template,
- "bin/{{default_release_name}}-{{default_release_version}}"}]},
+ "bin/{{default_release_name}}-{{default_release_version}}"},
+ {copy, "{{erts_dir}}/bin/erl", "bin/copy.erl"}]},
{release, {foo, "0.0.1"},
[goal_app_1,
goal_app_2]}]),
@@ -728,6 +729,7 @@ overlay_release(Config) ->
?assert(ec_file:exists(filename:join([OutputDir, "foo", "foodir", "vars1.config"]))),
?assert(ec_file:exists(filename:join([OutputDir, "foo", "yahoo", "vars1.config"]))),
?assert(ec_file:exists(filename:join([OutputDir, "foo", SecondTestDir, TestDir, TestFile]))),
+ ?assert(ec_file:exists(filename:join([OutputDir, "foo", "bin", "copy.erl"]))),
TemplateData = case file:consult(filename:join([OutputDir, "foo", "test_template_resolved"])) of
{ok, Details} ->