diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2018-02-21 19:25:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-21 19:25:12 -0500 |
| commit | 94ea0630b1b9b06459857e98f83c8b0ef5dbecc4 (patch) | |
| tree | 0fbccee2040e1a152263940f8392b00109e178c9 /src | |
| parent | ea79c6ad8815f6b74fc673668ba5f63f8763b2e0 (diff) | |
| parent | fee322edb91bd04fc24287f28d94c08fe0632812 (diff) | |
Merge pull request #1698 from campanja-forks/run-clean-hooks
fix hooks and plugins usage when cleaning build artifacts for deps
Diffstat (limited to 'src')
| -rw-r--r-- | src/rebar_app_discover.erl | 11 | ||||
| -rw-r--r-- | src/rebar_prv_clean.erl | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/rebar_app_discover.erl b/src/rebar_app_discover.erl index cdd183c..1c02a48 100644 --- a/src/rebar_app_discover.erl +++ b/src/rebar_app_discover.erl @@ -331,14 +331,19 @@ create_app_info(AppInfo, AppDir, AppFile) -> AppInfo2 = rebar_app_info:applications( rebar_app_info:app_details(AppInfo1, AppDetails), IncludedApplications++Applications), - Valid = case rebar_app_utils:validate_application_info(AppInfo2) =:= true - andalso rebar_app_info:has_all_artifacts(AppInfo2) =:= true of + C = rebar_config:consult(AppDir), + AppInfo3 = rebar_app_info:update_opts(AppInfo2, + rebar_app_info:opts(AppInfo2), C), + ?DEBUG("create_app_info(~p, ~p, ~p) -> ~n~p~n", + [AppInfo, AppDir, AppFile, AppInfo3]), + Valid = case rebar_app_utils:validate_application_info(AppInfo3) =:= true + andalso rebar_app_info:has_all_artifacts(AppInfo3) =:= true of true -> true; _ -> false end, - rebar_app_info:dir(rebar_app_info:valid(AppInfo2, Valid), AppDir). + rebar_app_info:dir(rebar_app_info:valid(AppInfo3, Valid), AppDir). %% @doc Read in and parse the .app file if it is availabe. Do the same for %% the .app.src file if it exists. diff --git a/src/rebar_prv_clean.erl b/src/rebar_prv_clean.erl index aa0b5af..4da0a64 100644 --- a/src/rebar_prv_clean.erl +++ b/src/rebar_prv_clean.erl @@ -12,7 +12,7 @@ -include("rebar.hrl"). -define(PROVIDER, clean). --define(DEPS, [app_discovery]). +-define(DEPS, [app_discovery, install_deps]). %% =================================================================== %% Public API |