mirror of
https://github.com/correl/rebar.git
synced 2024-11-14 19:19:30 +00:00
Fixed problem where install was broken when the .app file is generated from
This commit is contained in:
parent
2c7804819c
commit
73a67adab4
1 changed files with 13 additions and 3 deletions
|
@ -68,12 +68,22 @@ clean(_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
|
||||
%% 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_name(AppName, File),
|
||||
validate_name(AppName, AppFile),
|
||||
validate_modules(AppName, proplists:get_value(modules, AppData)),
|
||||
|
||||
%% Get the target directory. The user can specify a target= directory
|
||||
|
@ -176,7 +186,7 @@ validate_name(AppName, File) ->
|
|||
end.
|
||||
|
||||
validate_modules(AppName, undefined) ->
|
||||
?ERROR("Missing modules declaration in~p.app:\n~s", [AppName]),
|
||||
?ERROR("Missing modules declaration in~p.app:\n", [AppName]),
|
||||
?FAIL;
|
||||
|
||||
validate_modules(AppName, Mods) ->
|
||||
|
|
Loading…
Reference in a new issue