diff options
author | Tristan Sloughter <tristan.sloughter@gmail.com> | 2015-07-01 17:20:55 -0500 |
---|---|---|
committer | Tristan Sloughter <tristan.sloughter@gmail.com> | 2015-07-01 17:20:55 -0500 |
commit | a57afa0e571a0f554aecb30483b8bdd42539f67c (patch) | |
tree | e925c68553e3c1c1495dd83f24155a05b7e5d890 /src | |
parent | ff1079f678e0bb633ca8bc8eb96f8f7b4efd33a7 (diff) | |
parent | 35f2a479b1bf0f948e42801a1d322d1646a2510c (diff) |
Merge pull request #577 from ferd/fix-path-loading-in-shell
Apply profiles properly & load all paths
Diffstat (limited to 'src')
-rw-r--r-- | src/rebar_agent.erl | 12 |
1 files changed, 9 insertions, 3 deletions
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] ). |