diff options
author | Fred Hebert <mononcqc@ferd.ca> | 2015-06-28 18:16:40 -0400 |
---|---|---|
committer | Fred Hebert <mononcqc@ferd.ca> | 2015-06-28 18:16:40 -0400 |
commit | 9803bb93fab58f3c7e4fe26af3294b15ed55cfca (patch) | |
tree | bf71149c9292bdbf5c22f87ea10181b8c3d05450 /src/rebar_prv_release.erl | |
parent | 88f3077f8576d0ce5deaad06cef35c69031e1055 (diff) | |
parent | 7e0734efda17849317fc2184b6e6efcc500a3bf6 (diff) |
Merge pull request #557 from tsloughter/relx_args
only reverse some relx args, fixes profile usage for relx
Diffstat (limited to 'src/rebar_prv_release.erl')
-rw-r--r-- | src/rebar_prv_release.erl | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/src/rebar_prv_release.erl b/src/rebar_prv_release.erl index dc58047..2cf9b23 100644 --- a/src/rebar_prv_release.erl +++ b/src/rebar_prv_release.erl @@ -32,34 +32,7 @@ init(State) -> -spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}. do(State) -> - Options = rebar_state:command_args(State), - DepsDir = rebar_dir:deps_dir(State), - ProjectAppDirs = lists:delete(".", ?DEFAULT_PROJECT_APP_DIRS), - LibDirs = rebar_utils:filtermap(fun ec_file:exists/1, - [?DEFAULT_CHECKOUTS_DIR, DepsDir | ProjectAppDirs]), - OutputDir = filename:join(rebar_dir:base_dir(State), ?DEFAULT_RELEASE_DIR), - AllOptions = string:join(["release" | Options], " "), - Cwd = rebar_state:dir(State), - Providers = rebar_state:providers(State), - rebar_hooks:run_all_hooks(Cwd, pre, ?PROVIDER, Providers, State), - try - case rebar_state:get(State, relx, []) of - [] -> - relx:main([{lib_dirs, LibDirs} - ,{output_dir, OutputDir} - ,{caller, api}], AllOptions); - Config -> - relx:main([{lib_dirs, LibDirs} - ,{config, lists:reverse(Config)} - ,{output_dir, OutputDir} - ,{caller, api}], AllOptions) - end, - rebar_hooks:run_all_hooks(Cwd, post, ?PROVIDER, Providers, State), - {ok, State} - catch - throw:T -> - {error, {rlx_prv_release, T}} - end. + rebar_relx:do(rlx_prv_release, "release", ?PROVIDER, State). -spec format_error(any()) -> iolist(). format_error(Reason) -> |