diff options
author | AlexSedov <[email protected]> | 2018-07-31 18:31:25 +0300 |
---|---|---|
committer | AlexSedov <[email protected]> | 2018-07-31 18:31:25 +0300 |
commit | d903c6e52fd7a28e5cee8d0459f0e2ee795f2c93 (patch) | |
tree | 8f44a70fd2ebad00fc1b52d037f1523c162f3d9c /src/rlx_prv_release.erl | |
parent | b69658a37a0cf62a45bc0de89551344b2cf38595 (diff) | |
download | relx-d903c6e52fd7a28e5cee8d0459f0e2ee795f2c93.tar.gz relx-d903c6e52fd7a28e5cee8d0459f0e2ee795f2c93.tar.bz2 relx-d903c6e52fd7a28e5cee8d0459f0e2ee795f2c93.zip |
Make {goals, ...} option add goals to release depsolver.
Additionally, provides parsing for in-config goals,
and better goal merging.
Closes #571.
This reverts commit 0ffe8cd1a2a4e039a48d1096fc250b3f6bd3dcd1.
Diffstat (limited to 'src/rlx_prv_release.erl')
-rw-r--r-- | src/rlx_prv_release.erl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/rlx_prv_release.erl b/src/rlx_prv_release.erl index 8de1a51..9be190e 100644 --- a/src/rlx_prv_release.erl +++ b/src/rlx_prv_release.erl @@ -168,12 +168,14 @@ solve_release(State0, DepGraph, RelName, RelVsn) -> %% get per release config values and override the State with them Config = rlx_release:config(Release), {ok, State1} = lists:foldl(fun rlx_config:load_terms/2, {ok, State0}, Config), - Goals = rlx_release:goals(Release), - case Goals of + Goals = rlx_release:constraints(Release), + GlobalGoals = rlx_state:goals(State1), + MergedGoals = rlx_release:merge_application_goals(Goals, GlobalGoals), + case MergedGoals of [] -> ?RLX_ERROR(no_goals_specified); _ -> - case rlx_depsolver:solve(DepGraph, Goals) of + case rlx_depsolver:solve(DepGraph, MergedGoals) of {ok, Pkgs} -> set_resolved(State1, Release, Pkgs); {error, Error} -> |