aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTristan Sloughter <[email protected]>2014-01-18 09:48:04 -0600
committerTristan Sloughter <[email protected]>2014-01-18 09:48:04 -0600
commit9cb9bcebbe5d4e2888fd80a0d1c894a3b8e1ea14 (patch)
tree51b17f4dff1157ec188091314a0f6201b0ec9e2c /src
parentefecde83481e6603f2ccfd4a5e608c006296ffc4 (diff)
downloadrelx-9cb9bcebbe5d4e2888fd80a0d1c894a3b8e1ea14.tar.gz
relx-9cb9bcebbe5d4e2888fd80a0d1c894a3b8e1ea14.tar.bz2
relx-9cb9bcebbe5d4e2888fd80a0d1c894a3b8e1ea14.zip
add config option for output_dir, currently only a cmd arg
Diffstat (limited to 'src')
-rw-r--r--src/rlx_prv_config.erl2
-rw-r--r--src/rlx_state.erl5
2 files changed, 7 insertions, 0 deletions
diff --git a/src/rlx_prv_config.erl b/src/rlx_prv_config.erl
index aa2e79c..0379c2f 100644
--- a/src/rlx_prv_config.erl
+++ b/src/rlx_prv_config.erl
@@ -189,6 +189,8 @@ load_terms({vm_args, VmArgs}, {ok, State}) ->
{ok, rlx_state:vm_args(State, filename:absname(VmArgs))};
load_terms({sys_config, SysConfig}, {ok, State}) ->
{ok, rlx_state:sys_config(State, filename:absname(SysConfig))};
+load_terms({output_dir, OutputDir}, {ok, State}) ->
+ {ok, rlx_state:output_dir(State, filename:absname(OutputDir))};
load_terms({overlay_vars, OverlayVars}, {ok, State}) ->
CurrentOverlayVars = rlx_state:get(State, overlay_vars),
NewOverlayVars0 = list_of_overlay_vars_files(OverlayVars),
diff --git a/src/rlx_state.erl b/src/rlx_state.erl
index bc4af5b..2d0493b 100644
--- a/src/rlx_state.erl
+++ b/src/rlx_state.erl
@@ -27,6 +27,7 @@
log/1,
actions/1,
output_dir/1,
+ output_dir/2,
lib_dirs/1,
add_lib_dirs/2,
overrides/1,
@@ -186,6 +187,10 @@ log(#state_t{log=LogState}) ->
output_dir(#state_t{output_dir=OutDir}) ->
OutDir.
+-spec output_dir(t(), Directory::file:filename()) -> t().
+output_dir(State, Directory) ->
+ State#state_t{output_dir=Directory}.
+
-spec lib_dirs(t()) -> [file:name()].
lib_dirs(#state_t{lib_dirs=LibDir}) ->
LibDir.