aboutsummaryrefslogtreecommitdiffstats
path: root/src/rlx_config.erl
diff options
context:
space:
mode:
authorTristan Sloughter <[email protected]>2018-06-12 19:07:22 -0600
committerGitHub <[email protected]>2018-06-12 19:07:22 -0600
commitee477fb31ad9a7603aaea8922aaa9ecd3712ee2d (patch)
tree5d37580d953db02cddfbf1821d3ba535677e3e1e /src/rlx_config.erl
parent53f4c6eb6b57408a8b3cad412373db534a13ca1f (diff)
downloadrelx-ee477fb31ad9a7603aaea8922aaa9ecd3712ee2d.tar.gz
relx-ee477fb31ad9a7603aaea8922aaa9ecd3712ee2d.tar.bz2
relx-ee477fb31ad9a7603aaea8922aaa9ecd3712ee2d.zip
support for OTP21's sys.config.src file in releases (#647)
* support for OTP21's sys.config.src file in releases * always replace os vars in .src files if found * support vm_args_src to be consistent with sys_config_src * add newlines after warning logs * improve sys and vm src config tests
Diffstat (limited to 'src/rlx_config.erl')
-rw-r--r--src/rlx_config.erl4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/rlx_config.erl b/src/rlx_config.erl
index 57aac71..ee58db5 100644
--- a/src/rlx_config.erl
+++ b/src/rlx_config.erl
@@ -256,10 +256,14 @@ load_terms({vm_args, false}, {ok, State}) ->
{ok, rlx_state:vm_args(State, false)};
load_terms({vm_args, VmArgs}, {ok, State}) ->
{ok, rlx_state:vm_args(State, filename:absname(VmArgs))};
+load_terms({vm_args_src, VmArgs}, {ok, State}) ->
+ {ok, rlx_state:vm_args_src(State, filename:absname(VmArgs))};
load_terms({sys_config, false}, {ok, State}) ->
{ok, rlx_state:sys_config(State, false)};
load_terms({sys_config, SysConfig}, {ok, State}) ->
{ok, rlx_state:sys_config(State, filename:absname(SysConfig))};
+load_terms({sys_config_src, SysConfigSrc}, {ok, State}) ->
+ {ok, rlx_state:sys_config_src(State, filename:absname(SysConfigSrc))};
load_terms({root_dir, Root}, {ok, State}) ->
{ok, rlx_state:root_dir(State, filename:absname(Root))};
load_terms({output_dir, OutputDir}, {ok, State}) ->