瀏覽代碼

use processed app file for validation

pull/118/head
Tristan Sloughter 10 年之前
父節點
當前提交
f13804ffab
共有 2 個文件被更改,包括 6 次插入3 次删除
  1. +5
    -2
      src/rebar_app_discover.erl
  2. +1
    -1
      src/rebar_otp_app.erl

+ 5
- 2
src/rebar_app_discover.erl 查看文件

@ -6,7 +6,8 @@
find_apps/1, find_apps/1,
find_apps/2, find_apps/2,
find_app/2, find_app/2,
validate_application_info/1]).
validate_application_info/1,
validate_application_info/2]).
-include_lib("providers/include/providers.hrl"). -include_lib("providers/include/providers.hrl").
@ -140,12 +141,14 @@ create_app_info(AppDir, AppFile) ->
-spec validate_application_info(rebar_app_info:t()) -> boolean(). -spec validate_application_info(rebar_app_info:t()) -> boolean().
validate_application_info(AppInfo) -> validate_application_info(AppInfo) ->
validate_application_info(AppInfo, rebar_app_info:app_details(AppInfo)).
validate_application_info(AppInfo, AppDetail) ->
EbinDir = rebar_app_info:ebin_dir(AppInfo), EbinDir = rebar_app_info:ebin_dir(AppInfo),
case rebar_app_info:app_file(AppInfo) of case rebar_app_info:app_file(AppInfo) of
undefined -> undefined ->
false; false;
AppFile -> AppFile ->
AppDetail = rebar_app_info:app_details(AppInfo),
case get_modules_list(AppFile, AppDetail) of case get_modules_list(AppFile, AppDetail) of
{ok, List} -> {ok, List} ->
has_all_beams(EbinDir, List); has_all_beams(EbinDir, List);

+ 1
- 1
src/rebar_otp_app.erl 查看文件

@ -101,7 +101,7 @@ validate_app_modules(State, App, AppData) ->
AppVsn = proplists:get_value(vsn, AppData), AppVsn = proplists:get_value(vsn, AppData),
case rebar_state:get(State, validate_app_modules, true) of case rebar_state:get(State, validate_app_modules, true) of
true -> true ->
case rebar_app_discover:validate_application_info(App) of
case rebar_app_discover:validate_application_info(App, AppData) of
true -> true ->
{ok, rebar_app_info:original_vsn(App, AppVsn)}; {ok, rebar_app_info:original_vsn(App, AppVsn)};
Error -> Error ->

Loading…
取消
儲存