summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTristan Sloughter <t@crashfast.com>2015-03-06 08:59:10 -0600
committerTristan Sloughter <t@crashfast.com>2015-03-06 08:59:10 -0600
commit0638c85634f3f9f51f17f247a3376f72b2f4d2fa (patch)
tree7103bfe71b5b6f5298192ad1481e38943726e895 /src
parent67aca881c1ad5f3bb3f10c28bc0bc04c45d09407 (diff)
store base opts after initialization of providers
Diffstat (limited to 'src')
-rw-r--r--src/rebar3.erl9
-rw-r--r--src/rebar_app_discover.erl7
-rw-r--r--src/rebar_state.erl1
3 files changed, 10 insertions, 7 deletions
diff --git a/src/rebar3.erl b/src/rebar3.erl
index d7597cd..5b7db24 100644
--- a/src/rebar3.erl
+++ b/src/rebar3.erl
@@ -115,8 +115,7 @@ run_aux(State, GlobalPluginProviders, RawArgs) ->
false ->
State;
Profile ->
- State1 = rebar_state:apply_profiles(State, [list_to_atom(Profile)]),
- rebar_state:default(State1, rebar_state:opts(State1))
+ rebar_state:apply_profiles(State, [list_to_atom(Profile)])
end,
%% Process each command, resetting any state between each one
@@ -127,11 +126,15 @@ run_aux(State, GlobalPluginProviders, RawArgs) ->
{ok, Providers} = application:get_env(rebar, providers),
{ok, PluginProviders, State4} = rebar_plugins:install(State3),
rebar_core:update_code_path(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)),
+
{Task, Args} = parse_args(RawArgs),
- rebar_core:process_command(rebar_state:command_args(State5, Args), Task).
+ rebar_core:process_command(rebar_state:command_args(State6, Args), Task).
init_config() ->
%% Initialize logging system
diff --git a/src/rebar_app_discover.erl b/src/rebar_app_discover.erl
index c5c0efd..c720f72 100644
--- a/src/rebar_app_discover.erl
+++ b/src/rebar_app_discover.erl
@@ -35,13 +35,12 @@ format_error({missing_module, Module}) ->
merge_deps(AppInfo, State) ->
Default = rebar_state:default(State),
- Profiles = rebar_state:current_profiles(State),
+ CurrentProfiles = rebar_state:current_profiles(State),
Name = rebar_app_info:name(AppInfo),
C = rebar_config:consult(rebar_app_info:dir(AppInfo)),
-
AppState = rebar_state:apply_overrides(
rebar_state:apply_profiles(
- rebar_state:new(rebar_state:opts(State, Default), C, rebar_app_info:dir(AppInfo)), Profiles), Name),
+ rebar_state:new(rebar_state:opts(State, Default), C, rebar_app_info:dir(AppInfo)), CurrentProfiles), Name),
AppInfo1 = rebar_app_info:state(AppInfo, AppState),
State1 = lists:foldl(fun(Profile, StateAcc) ->
@@ -49,7 +48,7 @@ merge_deps(AppInfo, State) ->
TopLevelProfDeps = rebar_state:get(StateAcc, {deps, Profile}, []),
ProfDeps2 = lists:keymerge(1, TopLevelProfDeps, AppProfDeps),
rebar_state:set(StateAcc, {deps, Profile}, ProfDeps2)
- end, State, lists:reverse(Profiles)),
+ end, State, lists:reverse(CurrentProfiles)),
{AppInfo1, State1}.
diff --git a/src/rebar_state.erl b/src/rebar_state.erl
index 6ca3baa..e77a259 100644
--- a/src/rebar_state.erl
+++ b/src/rebar_state.erl
@@ -96,6 +96,7 @@ new(ParentState, Config, Dir) ->
D = proplists:get_value(deps, Config, []),
dict:from_list([{{deps, default}, D} | Config])
end,
+
NewOpts = dict:merge(fun(_Key, Value1, _Value2) ->
Value1
end, LocalOpts, Opts),