diff options
| author | Tristan Sloughter <[email protected]> | 2012-12-26 18:10:28 -0800 |
|---|---|---|
| committer | Tristan Sloughter <[email protected]> | 2012-12-26 18:10:28 -0800 |
| commit | ed855acb2246aaa05d2fab628e1e09d1082b06a8 (patch) | |
| tree | 7123eb46c722745abe5db11a9a52eb8f598d5786 /src/rcl_state.erl | |
| parent | cef19567813d442fe8190bbd5404e0b6ce3ac153 (diff) | |
| parent | 078d3c349b3f465dc2f45f0bbfcff297e82074e5 (diff) | |
| download | relx-ed855acb2246aaa05d2fab628e1e09d1082b06a8.tar.gz relx-ed855acb2246aaa05d2fab628e1e09d1082b06a8.tar.bz2 relx-ed855acb2246aaa05d2fab628e1e09d1082b06a8.zip | |
Merge pull request #19 from ericbmerritt/next
overlay support
Diffstat (limited to 'src/rcl_state.erl')
| -rw-r--r-- | src/rcl_state.erl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/rcl_state.erl b/src/rcl_state.erl index bd26a47..eb70ecc 100644 --- a/src/rcl_state.erl +++ b/src/rcl_state.erl @@ -133,7 +133,7 @@ output_dir(#state_t{output_dir=OutDir}) -> lib_dirs(#state_t{lib_dirs=LibDir}) -> LibDir. --spec goals(t()) -> [rcl_depsolver:constraints()]. +-spec goals(t()) -> [rcl_depsolver:constraint()]. goals(#state_t{goals=TS}) -> TS. @@ -280,9 +280,10 @@ create_logic_providers(State0) -> {ConfigProvider, {ok, State1}} = rcl_provider:new(rcl_prv_config, State0), {DiscoveryProvider, {ok, State2}} = rcl_provider:new(rcl_prv_discover, State1), {ReleaseProvider, {ok, State3}} = rcl_provider:new(rcl_prv_release, State2), - {AssemblerProvider, {ok, State4}} = rcl_provider:new(rcl_prv_assembler, State3), - State4#state_t{providers=[ConfigProvider, DiscoveryProvider, - ReleaseProvider, AssemblerProvider]}. + {OverlayProvider, {ok, State4}} = rcl_provider:new(rcl_prv_overlay, State3), + {AssemblerProvider, {ok, State5}} = rcl_provider:new(rcl_prv_assembler, State4), + State5#state_t{providers=[ConfigProvider, DiscoveryProvider, + ReleaseProvider, OverlayProvider, AssemblerProvider]}. %% @doc config files can come in as either a single file name or as a list of |