diff options
| author | Tristan Sloughter <tristan.sloughter@gmail.com> | 2015-03-02 19:04:03 -0600 |
|---|---|---|
| committer | Tristan Sloughter <tristan.sloughter@gmail.com> | 2015-03-02 19:04:03 -0600 |
| commit | baf46a861b18086131707d056ee106c9fba8da3d (patch) | |
| tree | c0bc1de343e52f8385d9f1740e32df5e85dfa234 /src/rebar_app_discover.erl | |
| parent | 8affde1c37ba746df41343a52fd8e239ebfe2db3 (diff) | |
| parent | af0f4bb20a66f1464fa25d31f9b69784f3119493 (diff) | |
Merge pull request #187 from tsloughter/profiles_dir
make base_dir for a run include the profiles in path, link to shared dep
Diffstat (limited to 'src/rebar_app_discover.erl')
| -rw-r--r-- | src/rebar_app_discover.erl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/rebar_app_discover.erl b/src/rebar_app_discover.erl index f6ed91b..761c09e 100644 --- a/src/rebar_app_discover.erl +++ b/src/rebar_app_discover.erl @@ -14,14 +14,18 @@ do(State, LibDirs) -> Dirs = [filename:join(BaseDir, LibDir) || LibDir <- LibDirs], Apps = find_apps(Dirs, all), ProjectDeps = rebar_state:deps_names(State), + DepsDir = rebar_dir:deps_dir(State), %% Sort apps so we get the same merged deps config everytime SortedApps = rebar_utils:sort_deps(Apps), lists:foldl(fun(AppInfo, StateAcc) -> StateAcc1 = merge_deps(AppInfo, StateAcc), - ProjectDeps1 = lists:delete(rebar_app_info:name(AppInfo), ProjectDeps), + Name = rebar_app_info:name(AppInfo), + OutDir = filename:join(DepsDir, Name), + AppInfo1 = rebar_app_info:out_dir(AppInfo, OutDir), + ProjectDeps1 = lists:delete(Name, ProjectDeps), rebar_state:project_apps(StateAcc1 - ,rebar_app_info:deps(AppInfo, ProjectDeps1)) + ,rebar_app_info:deps(AppInfo1, ProjectDeps1)) end, State, SortedApps). format_error({module_list, File}) -> |