aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJordan Wilberding <[email protected]>2014-05-14 15:31:54 +0200
committerJordan Wilberding <[email protected]>2014-05-14 15:31:54 +0200
commit84b176094d06ff22b3c495fa90976e9aaa4a04f2 (patch)
tree5c6f08c210e1746e4e0398c7cf42c0ee593427a2 /src
parent184f6d067557bdb21334e8e6fb4129711eadab36 (diff)
parent58483667f599433d9843445159522b8f0353419c (diff)
downloadrelx-84b176094d06ff22b3c495fa90976e9aaa4a04f2.tar.gz
relx-84b176094d06ff22b3c495fa90976e9aaa4a04f2.tar.bz2
relx-84b176094d06ff22b3c495fa90976e9aaa4a04f2.zip
Merge pull request #175 from tsloughter/new_output
breaking change: output release to <output_dir>/<release_name>/
Diffstat (limited to 'src')
-rw-r--r--src/rlx_prv_config.erl2
-rw-r--r--src/rlx_state.erl16
2 files changed, 12 insertions, 6 deletions
diff --git a/src/rlx_prv_config.erl b/src/rlx_prv_config.erl
index 7c2ace0..9efd8a0 100644
--- a/src/rlx_prv_config.erl
+++ b/src/rlx_prv_config.erl
@@ -200,7 +200,7 @@ load_terms({sys_config, SysConfig}, {ok, State}) ->
{ok, State}
end;
load_terms({output_dir, OutputDir}, {ok, State}) ->
- {ok, rlx_state:output_dir(State, filename:absname(OutputDir))};
+ {ok, rlx_state:base_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 c3c3176..5b488c8 100644
--- a/src/rlx_state.erl
+++ b/src/rlx_state.erl
@@ -26,8 +26,9 @@
-export([new/2,
log/1,
actions/1,
- output_dir/1,
- output_dir/2,
+ output_dir/1,
+ base_output_dir/1,
+ base_output_dir/2,
lib_dirs/1,
add_lib_dirs/2,
overrides/1,
@@ -185,11 +186,16 @@ log(#state_t{log=LogState}) ->
LogState.
-spec output_dir(t()) -> file:name().
-output_dir(#state_t{output_dir=OutDir}) ->
+output_dir(State=#state_t{output_dir=OutDir}) ->
+ {RelName, _RelVsn} = default_configured_release(State),
+ filename:join(OutDir, RelName).
+
+-spec base_output_dir(t()) -> file:name().
+base_output_dir(#state_t{output_dir=OutDir}) ->
OutDir.
--spec output_dir(t(), Directory::file:filename()) -> t().
-output_dir(State, Directory) ->
+-spec base_output_dir(t(), Directory::file:filename()) -> t().
+base_output_dir(State, Directory) ->
State#state_t{output_dir=Directory}.
-spec lib_dirs(t()) -> [file:name()].