From 88598b2f166849cd87ab102dcbab4497458b70cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Rasc=C3=A3o?= Date: Thu, 19 Oct 2017 05:24:37 +0100 Subject: Add `erts_dir` overlay var (#614) Useful for copying custom files from an erts build such as a .kerl.config file. --- src/rlx_prv_overlay.erl | 1 + test/rlx_release_SUITE.erl | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) 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} -> -- cgit v1.2.3