From 35f2a479b1bf0f948e42801a1d322d1646a2510c Mon Sep 17 00:00:00 2001 From: Fred Hebert Date: Wed, 1 Jul 2015 15:18:15 +0000 Subject: Apply profiles properly & load all paths The old run didn't necessarily apply all profiles well, and would only reload modules in the app file. However, since adding extra_src_dirs, modules can be compiled without ending up in the app file; this lets the rebar3 shell agent handle that case. --- src/rebar_agent.erl | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/rebar_agent.erl') diff --git a/src/rebar_agent.erl b/src/rebar_agent.erl index 674e002..24ac626 100644 --- a/src/rebar_agent.erl +++ b/src/rebar_agent.erl @@ -87,16 +87,22 @@ refresh_paths(RState) -> %% make sure to never reload self; halt()s the VM ) -- [filename:dirname(code:which(?MODULE))], %% Similar to rebar_utils:update_code/1, but also forces a reload - %% of used modules. + %% of used modules. Also forces to reload all of ebin/ instead + %% of just the modules in the .app file, because 'extra_src_dirs' + %% allows to load and compile files that are not to be kept + %% in the app file. lists:foreach(fun(Path) -> Name = filename:basename(Path, "/ebin"), + Files = filelib:wildcard(filename:join([Path, "*.beam"])), + Modules = [list_to_atom(filename:basename(F, ".beam")) + || F <- Files], App = list_to_atom(Name), application:load(App), case application:get_key(App, modules) of undefined -> code:add_patha(Path), ok; - {ok, Modules} -> + {ok, _} -> ?DEBUG("reloading ~p from ~s", [Modules, Path]), code:replace_path(Name, Path), [begin code:purge(M), code:delete(M), code:load_file(M) end @@ -108,5 +114,5 @@ refresh_state(RState, _Dir) -> lists:foldl( fun(F, State) -> F(State) end, rebar3:init_config(), - [fun(S) -> rebar_state:current_profiles(S, rebar_state:current_profiles(RState)) end] + [fun(S) -> rebar_state:apply_profiles(S, rebar_state:current_profiles(RState)) end] ). -- cgit v1.1