summaryrefslogtreecommitdiff
path: root/src/rebar3.erl
diff options
context:
space:
mode:
authorTristan Sloughter <t@crashfast.com>2015-04-04 16:08:25 -0500
committerTristan Sloughter <t@crashfast.com>2015-04-04 20:36:52 -0500
commit38de29ae424ecc2dd0ccee4c1ee4bf3a5bb021da (patch)
tree28a3db9ea67453955e20992434bd60141f6740cb /src/rebar3.erl
parent00a183e3a882d68789917dc134754461ff8514d9 (diff)
move resource modules list to rebar_state, no longer static
Diffstat (limited to 'src/rebar3.erl')
-rw-r--r--src/rebar3.erl10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/rebar3.erl b/src/rebar3.erl
index 87258aa..f853411 100644
--- a/src/rebar3.erl
+++ b/src/rebar3.erl
@@ -124,16 +124,18 @@ run_aux(State, GlobalPluginProviders, RawArgs) ->
filename:join(filename:absname(rebar_state:dir(State2)), BaseDir)),
{ok, Providers} = application:get_env(rebar, providers),
- {ok, PluginProviders, State4} = rebar_plugins:install(State3),
+ {ok, Resources} = application:get_env(rebar, resources),
+ State4 = rebar_state:resources(State3, Resources),
+ {ok, PluginProviders, State5} = rebar_plugins:install(State4),
%% Providers can modify profiles stored in opts, so set default after initializing providers
AllProviders = Providers++PluginProviders++GlobalPluginProviders,
- State5 = rebar_state:create_logic_providers(AllProviders, State4),
- State6 = rebar_state:default(State5, rebar_state:opts(State5)),
+ State6 = rebar_state:create_logic_providers(AllProviders, State5),
+ State7 = rebar_state:default(State6, rebar_state:opts(State6)),
{Task, Args} = parse_args(RawArgs),
- rebar_core:init_command(rebar_state:command_args(State6, Args), Task).
+ rebar_core:init_command(rebar_state:command_args(State7, Args), Task).
init_config() ->
%% Initialize logging system