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_state.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_state.erl')
| -rw-r--r-- | src/rlx_state.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rlx_state.erl b/src/rlx_state.erl index 5488a41..cab55f6 100644 --- a/src/rlx_state.erl +++ b/src/rlx_state.erl @@ -105,7 +105,7 @@ lib_dirs=[] :: [file:name()], config_file=[] :: file:filename() | undefined, cli_args=[] :: proplists:proplist(), - goals=[] :: [rlx_depsolver:constraint()], + goals=[] :: [rlx_depsolver:raw_constraint()], providers=[] :: [providers:t()], available_apps=[] :: [rlx_app_info:t()], default_configured_release :: {rlx_release:name() | undefined, rlx_release:vsn() |undefined} | undefined, @@ -254,11 +254,11 @@ lib_dirs(#state_t{lib_dirs=LibDir}) -> add_lib_dirs(State=#state_t{lib_dirs=LibDir}, Dirs) -> State#state_t{lib_dirs=lists:umerge(lists:sort(LibDir), lists:sort(Dirs))}. --spec goals(t()) -> [rlx_depsolver:constraint()]. +-spec goals(t()) -> [rlx_depsolver:raw_constraint()]. goals(#state_t{goals=TS}) -> TS. --spec goals(t(), [rlx_depsolver:constraint()]) -> t(). +-spec goals(t(), [rlx_depsolver:raw_constraint()]) -> t(). goals(State, Goals) -> State#state_t{goals=Goals}. |