Browse Source

update state's all_deps after they are compiled

pull/2303/head
Tristan Sloughter 4 years ago
parent
commit
5dd3a8a23f
No known key found for this signature in database GPG Key ID: AAB97DDECCEB8150
2 changed files with 8 additions and 4 deletions
  1. +4
    -3
      src/rebar_prv_compile.erl
  2. +4
    -1
      src/rebar_state.erl

+ 4
- 3
src/rebar_prv_compile.erl View File

@ -40,13 +40,14 @@ do(State) ->
Providers = rebar_state:providers(State), Providers = rebar_state:providers(State),
Deps = rebar_state:deps_to_build(State), Deps = rebar_state:deps_to_build(State),
copy_and_build_apps(State, Providers, Deps),
CompiledDeps = copy_and_build_apps(State, Providers, Deps),
State0 = rebar_state:merge_all_deps(State, CompiledDeps),
State1 = case IsDepsOnly of State1 = case IsDepsOnly of
true -> true ->
State;
State0;
false -> false ->
handle_project_apps(Providers, State)
handle_project_apps(Providers, State0)
end, end,
rebar_paths:set_paths([plugins], State1), rebar_paths:set_paths([plugins], State1),

+ 4
- 1
src/rebar_state.erl View File

@ -31,7 +31,7 @@
project_apps/1, project_apps/2, project_apps/1, project_apps/2,
deps_to_build/1, deps_to_build/2, deps_to_build/1, deps_to_build/2,
all_plugin_deps/1, all_plugin_deps/2, update_all_plugin_deps/2, all_plugin_deps/1, all_plugin_deps/2, update_all_plugin_deps/2,
all_deps/1, all_deps/2, update_all_deps/2,
all_deps/1, all_deps/2, update_all_deps/2, merge_all_deps/2,
namespace/1, namespace/2, namespace/1, namespace/2,
deps_names/1, deps_names/1,
@ -354,6 +354,9 @@ update_all_plugin_deps(State=#state_t{all_plugin_deps=Apps}, NewApps) ->
update_all_deps(State=#state_t{all_deps=Apps}, NewApps) -> update_all_deps(State=#state_t{all_deps=Apps}, NewApps) ->
State#state_t{all_deps=Apps++NewApps}. State#state_t{all_deps=Apps++NewApps}.
merge_all_deps(State=#state_t{all_deps=Apps}, UpdatedApps) when is_list(UpdatedApps) ->
State#state_t{all_deps=lists:ukeymerge(2, lists:keysort(2, UpdatedApps), lists:keysort(2, Apps))}.
namespace(#state_t{namespace=Namespace}) -> namespace(#state_t{namespace=Namespace}) ->
Namespace. Namespace.

Loading…
Cancel
Save