From 5223175c2633d2e81c4820a6e883f03d8beb92eb Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Sun, 6 Sep 2015 16:46:26 -0500 Subject: support updating of per app info by hooks --- src/rebar_prv_compile.erl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/rebar_prv_compile.erl') diff --git a/src/rebar_prv_compile.erl b/src/rebar_prv_compile.erl index 56e5e84..89ea430 100644 --- a/src/rebar_prv_compile.erl +++ b/src/rebar_prv_compile.erl @@ -84,14 +84,14 @@ build_app(State, Providers, AppInfo) -> compile(State, Providers, AppInfo) -> ?INFO("Compiling ~s", [rebar_app_info:name(AppInfo)]), AppDir = rebar_app_info:dir(AppInfo), - rebar_hooks:run_all_hooks(AppDir, pre, ?PROVIDER, Providers, AppInfo, State), - - rebar_erlc_compiler:compile(AppInfo), - case rebar_otp_app:compile(State, AppInfo) of - {ok, AppInfo1} -> - rebar_hooks:run_all_hooks(AppDir, post, ?PROVIDER, Providers, AppInfo, State), - has_all_artifacts(AppInfo1), - AppInfo1; + AppInfo1 = rebar_hooks:run_all_hooks(AppDir, pre, ?PROVIDER, Providers, AppInfo, State), + + rebar_erlc_compiler:compile(AppInfo1), + case rebar_otp_app:compile(State, AppInfo1) of + {ok, AppInfo2} -> + AppInfo3 = rebar_hooks:run_all_hooks(AppDir, post, ?PROVIDER, Providers, AppInfo2, State), + has_all_artifacts(AppInfo3), + AppInfo3; Error -> throw(Error) end. -- cgit v1.1