From 62ff6718fd3671dac98278d57f97a6fb089c374f Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Thu, 19 Feb 2015 08:30:19 -0600
Subject: update project app list with new appinfo records after build

---
 src/rebar_otp_app.erl     |  1 +
 src/rebar_plugins.erl     | 16 ++++++++--------
 src/rebar_prv_compile.erl | 44 +++++++++++++++++++++++---------------------
 3 files changed, 32 insertions(+), 29 deletions(-)

(limited to 'src')

diff --git a/src/rebar_otp_app.erl b/src/rebar_otp_app.erl
index e5e2361..272d950 100644
--- a/src/rebar_otp_app.erl
+++ b/src/rebar_otp_app.erl
@@ -54,6 +54,7 @@ compile(State, App) ->
     validate_app(State2, App1).
 
 
+
 format_error({file_read, File, Reason}) ->
     io_lib:format("Failed to read ~s for processing: ~p", [File, Reason]);
 format_error({invalid_name, File, AppName}) ->
diff --git a/src/rebar_plugins.erl b/src/rebar_plugins.erl
index 45cb5c9..333d8a1 100644
--- a/src/rebar_plugins.erl
+++ b/src/rebar_plugins.erl
@@ -32,14 +32,7 @@ handle_plugin(Plugin, State) ->
 
         Apps = rebar_state:all_deps(State1),
         ToBuild = lists:dropwhile(fun rebar_app_info:valid/1, Apps),
-        lists:foreach(fun(AppInfo) ->
-                              AppDir = rebar_app_info:dir(AppInfo),
-                              C = rebar_config:consult(AppDir),
-                              S = rebar_state:new(rebar_state:new(), C, AppDir),
-                              rebar_prv_compile:build(S, AppInfo),
-                              true = code:add_patha(filename:join(AppDir, "ebin"))
-                      end, ToBuild),
-
+        [build_plugin(AppInfo) || AppInfo <- ToBuild],
         plugin_providers(Plugin)
     catch
         C:T ->
@@ -48,6 +41,13 @@ handle_plugin(Plugin, State) ->
             false
     end.
 
+build_plugin(AppInfo) ->
+    AppDir = rebar_app_info:dir(AppInfo),
+    C = rebar_config:consult(AppDir),
+    S = rebar_state:new(rebar_state:new(), C, AppDir),
+    rebar_prv_compile:compile(S, AppInfo),
+    true = code:add_patha(filename:join(AppDir, "ebin")).
+
 plugin_providers({Plugin, _, _}) when is_atom(Plugin) ->
     validate_plugin(Plugin);
 plugin_providers({Plugin, _}) when is_atom(Plugin) ->
diff --git a/src/rebar_prv_compile.erl b/src/rebar_prv_compile.erl
index 073394c..c4cca16 100644
--- a/src/rebar_prv_compile.erl
+++ b/src/rebar_prv_compile.erl
@@ -6,7 +6,7 @@
          do/1,
          format_error/1]).
 
--export([build/2]).
+-export([compile/2]).
 
 -include("rebar.hrl").
 
@@ -55,34 +55,36 @@ do(State) ->
     %% Use the project State for building project apps
     %% Set hooks to empty so top-level hooks aren't run for each project app
     State2 = rebar_state:set(rebar_state:set(State1, post_hooks, []), pre_hooks, []),
-    build_apps(State2, ProjectApps),
+    ProjectApps1 = build_apps(State2, ProjectApps),
     rebar_hooks:run_compile_hooks(Cwd, post_hooks, compile, State1),
 
-    {ok, State1}.
+    {ok, rebar_state:project_apps(State1, ProjectApps1)}.
 
 -spec format_error(any()) -> iolist().
 format_error(Reason) ->
     io_lib:format("~p", [Reason]).
 
 build_apps(State, Apps) ->
-    lists:foreach(fun(AppInfo) ->
-                          AppDir = rebar_app_info:dir(AppInfo),
-                          S = case rebar_app_info:state(AppInfo) of
-                                  undefined ->
-                                      C = rebar_config:consult(AppDir),
-                                      rebar_state:new(State, C, AppDir);
-                                  AppState ->
-                                      AppState
-                              end,
-
-                          %% Legacy hook support
-                          rebar_hooks:run_compile_hooks(AppDir, pre_hooks, compile, S),
-                          build(S, AppInfo),
-                          rebar_hooks:run_compile_hooks(AppDir, post_hooks, compile, S),
-                          true = code:add_patha(filename:join(AppDir, "ebin"))
-                  end, Apps).
-
-build(State, AppInfo) ->
+    [build_app(State, AppInfo) || AppInfo <- Apps].
+
+build_app(State, AppInfo) ->
+    AppDir = rebar_app_info:dir(AppInfo),
+    S = case rebar_app_info:state(AppInfo) of
+            undefined ->
+                C = rebar_config:consult(AppDir),
+                rebar_state:new(State, C, AppDir);
+            AppState ->
+                AppState
+        end,
+
+    %% Legacy hook support
+    rebar_hooks:run_compile_hooks(AppDir, pre_hooks, compile, S),
+    AppInfo1 = compile(S, AppInfo),
+    rebar_hooks:run_compile_hooks(AppDir, post_hooks, compile, S),
+    true = code:add_patha(filename:join(AppDir, "ebin")),
+    AppInfo1.
+
+compile(State, AppInfo) ->
     ?INFO("Compiling ~s", [rebar_app_info:name(AppInfo)]),
     rebar_erlc_compiler:compile(State, ec_cnv:to_list(rebar_app_info:dir(AppInfo))),
     case rebar_otp_app:compile(State, AppInfo) of
-- 
cgit v1.1