diff options
| author | Tristan Sloughter <t@crashfast.com> | 2015-11-01 19:04:19 -0600 |
|---|---|---|
| committer | Tristan Sloughter <t@crashfast.com> | 2015-11-01 19:04:19 -0600 |
| commit | d119cfcf25d7dd449019f65d578304959b3c7c09 (patch) | |
| tree | da85f23627345dc88eda0f825c34f5ba0cbeeab8 /src/rebar_utils.erl | |
| parent | e72e46fc9d23d8467cd58d1728175ae59d2a7c44 (diff) | |
| parent | 67bf54d04d332bbff961ab4e8ab730858bcdce7a (diff) | |
Merge pull request #904 from talentdeficit/soft_purge_opt
add an option to soft purge rather than purge old code
Diffstat (limited to 'src/rebar_utils.erl')
| -rw-r--r-- | src/rebar_utils.erl | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/rebar_utils.erl b/src/rebar_utils.erl index d00a46f..ea60e42 100644 --- a/src/rebar_utils.erl +++ b/src/rebar_utils.erl @@ -47,6 +47,7 @@ deprecated/4, indent/1, update_code/1, + update_code/2, remove_from_code_path/1, cleanup_code_path/1, args_to_tasks/1, @@ -644,7 +645,9 @@ indent(Amount) when erlang:is_integer(Amount) -> %% Replace code paths with new paths for existing apps and %% purge code of the old modules from those apps. -update_code(Paths) -> +update_code(Paths) -> update_code(Paths, []). + +update_code(Paths, Opts) -> lists:foreach(fun(Path) -> Name = filename:basename(Path, "/ebin"), App = list_to_atom(Name), @@ -654,19 +657,18 @@ update_code(Paths) -> code:add_patha(Path), ok; {ok, Modules} -> - %% stick rebar ebin dir before purging to prevent - %% inadvertent termination - RebarBin = code:lib_dir(rebar, ebin), - ok = code:stick_dir(RebarBin), %% replace_path causes problems when running %% tests in projects like erlware_commons that rebar3 %% also includes %code:replace_path(App, Path), code:del_path(App), code:add_patha(Path), - [begin code:purge(M), code:delete(M) end || M <- Modules], - %% unstick rebar dir - ok = code:unstick_dir(RebarBin) + case lists:member(soft_purge, Opts) of + true -> + [begin code:soft_purge(M), code:delete(M) end || M <- Modules]; + false -> + [begin code:purge(M), code:delete(M) end || M <- Modules] + end end end, Paths). |