From be49c5cd44d536c440b3188f3e0a5279218ea4fc Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Tue, 17 Feb 2015 10:04:12 -0600
Subject: use project sub-apps with deps in their rebar.config

---
 src/rebar_app_discover.erl     | 21 +++++++++++++++++++--
 src/rebar_prv_install_deps.erl |  2 +-
 2 files changed, 20 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/rebar_app_discover.erl b/src/rebar_app_discover.erl
index 21dbe1b..0dc062f 100644
--- a/src/rebar_app_discover.erl
+++ b/src/rebar_app_discover.erl
@@ -16,16 +16,33 @@ do(State, LibDirs) ->
     Dirs = [filename:join(BaseDir, LibDir) || LibDir <- LibDirs],
     Apps = find_apps(Dirs, all),
     ProjectDeps = rebar_state:deps_names(State),
+
     lists:foldl(fun(AppInfo, StateAcc) ->
+                        StateAcc1 = merge_deps(AppInfo, StateAcc),
                         ProjectDeps1 = lists:delete(rebar_app_info:name(AppInfo), ProjectDeps),
-                        rebar_state:project_apps(StateAcc, rebar_app_info:deps(AppInfo, ProjectDeps1))
-            end, State, Apps).
+                        rebar_state:project_apps(StateAcc1
+                                                ,rebar_app_info:deps(AppInfo, ProjectDeps1))
+                end, State, Apps).
 
 format_error({module_list, File}) ->
     io_lib:format("Error reading module list from ~p~n", [File]);
 format_error({missing_module, Module}) ->
     io_lib:format("Module defined in app file missing: ~p~n", [Module]).
 
+merge_deps(AppInfo, State) ->
+    Profiles = rebar_state:current_profiles(State),
+    Name = rebar_app_info:name(AppInfo),
+    C = rebar_config:consult(rebar_app_info:dir(AppInfo)),
+    AppState = rebar_state:apply_overrides(
+                 rebar_state:apply_profiles(
+                   rebar_state:new(State, C, rebar_app_info:dir(AppInfo)), Profiles), Name),
+    lists:foldl(fun(Profile, StateAcc) ->
+                        AppProfDeps = rebar_state:get(AppState, {deps, Profile}, []),
+                        TopLevelProfDeps = rebar_state:get(StateAcc, {deps, Profile}, []),
+                        ProfDeps2 = lists:keymerge(1, TopLevelProfDeps, AppProfDeps),
+                        rebar_state:set(StateAcc, {deps, Profile}, ProfDeps2)
+                end, State, lists:reverse(Profiles)).
+
 -spec all_app_dirs(list(file:name())) -> list(file:name()).
 all_app_dirs(LibDirs) ->
     lists:flatmap(fun(LibDir) ->
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index 61fbd70..d922522 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -267,7 +267,7 @@ update_src_deps(Profile, Level, SrcDeps, PkgDeps, SrcApps, State, Upgrade, Seen,
                                                        ,StateAcc
                                                        ,LocksAcc),
 
-                                    {SrcDepsAcc1, PkgDepsAcc1, SrcAppsAcc1, StateAcc2, SeenAcc, LocksAcc1}
+                                             {SrcDepsAcc1, PkgDepsAcc1, SrcAppsAcc1, StateAcc2, SeenAcc, LocksAcc1}
                                      end;
                                  false ->
                                      {SeenAcc1, StateAcc1} = maybe_lock(Profile, AppInfo, SeenAcc, StateAcc, Level),
-- 
cgit v1.1