瀏覽代碼

Merge pull request #36 from tsloughter/config_reading

only read in rebar config and lock of dep if needed
pull/41/head
Tristan Sloughter 10 年之前
父節點
當前提交
859121d5d9
共有 2 個檔案被更改,包括 4 行新增18 行删除
  1. +4
    -17
      src/rebar_app_discover.erl
  2. +0
    -1
      src/rebar_prv_install_deps.erl

+ 4
- 17
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

+ 0
- 1
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

Loading…
取消
儲存