summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Sloughter <t@crashfast.com>2014-12-04 18:34:27 -0600
committerTristan Sloughter <t@crashfast.com>2014-12-04 19:19:17 -0600
commit0fc8e97292ceecf47409d1efdea8911ac4323026 (patch)
treee01af4f5c0ae1b59072ac6f56f12d6ec9bfcba7f
parent1a88cc285375e5558b12de502b515ef2ce503028 (diff)
only read in rebar config and lock of dep if needed
-rw-r--r--src/rebar_app_discover.erl21
-rw-r--r--src/rebar_prv_install_deps.erl1
2 files changed, 4 insertions, 18 deletions
diff --git a/src/rebar_app_discover.erl b/src/rebar_app_discover.erl
index e2bf05e..aad8985 100644
--- a/src/rebar_app_discover.erl
+++ b/src/rebar_app_discover.erl
@@ -121,23 +121,10 @@ create_app_info(AppDir, AppFile) ->
AppVsn = proplists:get_value(vsn, AppDetails),
Applications = proplists:get_value(applications, AppDetails, []),
IncludedApplications = proplists:get_value(included_applications, AppDetails, []),
- C = rebar_config:consult(AppDir),
- S = rebar_state:new(rebar_state:new(), C, AppDir),
- AppDeps = rebar_state:deps_names(S),
- AbsCwd = filename:absname(rebar_dir:get_cwd()),
- {ok, AppInfo} = rebar_app_info:new(AppName, AppVsn, AppDir, AppDeps),
- RebarConfig = filename:join(AppDir, "rebar.config"),
- AppState = case filelib:is_file(RebarConfig) of
- true ->
- Terms = rebar_config:consult_file(RebarConfig),
- rebar_state:new(Terms);
- false ->
- rebar_state:new()
- end,
- AppState1 = rebar_state:set(AppState, base_dir, AbsCwd),
- AppInfo1 = rebar_app_info:applications(rebar_app_info:config(
- rebar_app_info:app_details(AppInfo, AppDetails)
- ,AppState1), IncludedApplications++Applications),
+ {ok, AppInfo} = rebar_app_info:new(AppName, AppVsn, AppDir, []),
+ AppInfo1 = rebar_app_info:applications(
+ rebar_app_info:app_details(AppInfo, AppDetails),
+ IncludedApplications++Applications),
rebar_app_info:dir(AppInfo1, AppDir);
_ ->
error
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index 5fcc4d6..ade0c81 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -207,7 +207,6 @@ update_src_deps(Level, SrcDeps, PkgDeps, SrcApps, State, Update, Seen) ->
,SrcAppsAcc
,Level
,StateAcc1)
-
end,
{SrcDepsAcc1, PkgDepsAcc1, SrcAppsAcc1, StateAcc2, SeenAcc1}
end, {[], PkgDeps, SrcApps, State, Seen}, SrcDeps) of