Ver a proveniência

Fixed problem where install was broken when the .app file is generated from

Chris Chew há 15 anos
ascendente
cometimento
73a67adab4
1 ficheiros alterados com 13 adições e 3 eliminações
  1. +13
    -3
      src/rebar_otp_app.erl

+ 13
- 3
src/rebar_otp_app.erl Ver ficheiro

@ -68,12 +68,22 @@ clean(_Config, File) ->
install(Config, File) -> install(Config, File) ->
%% If we get an .app.src file, it needs to be pre-processed and
%% written out as a ebin/*.app file. That resulting file will then
%% be validated as usual.
case rebar_app_utils:is_app_src(File) of
true ->
AppFile = preprocess(File);
false ->
AppFile = File
end,
%% Load the app name and version from the .app file and construct %% Load the app name and version from the .app file and construct
%% the app identifier %% the app identifier
{ok, AppName, AppData} = rebar_app_utils:load_app_file(File),
{ok, AppName, AppData} = rebar_app_utils:load_app_file(AppFile),
%% Validate the .app file prior to installation %% Validate the .app file prior to installation
validate_name(AppName, File),
validate_name(AppName, AppFile),
validate_modules(AppName, proplists:get_value(modules, AppData)), validate_modules(AppName, proplists:get_value(modules, AppData)),
%% Get the target directory. The user can specify a target= directory %% Get the target directory. The user can specify a target= directory
@ -176,7 +186,7 @@ validate_name(AppName, File) ->
end. end.
validate_modules(AppName, undefined) -> validate_modules(AppName, undefined) ->
?ERROR("Missing modules declaration in~p.app:\n~s", [AppName]),
?ERROR("Missing modules declaration in~p.app:\n", [AppName]),
?FAIL; ?FAIL;
validate_modules(AppName, Mods) -> validate_modules(AppName, Mods) ->

Carregando…
Cancelar
Guardar