mirror of
https://github.com/correl/rebar.git
synced 2024-11-15 03:00:18 +00:00
Use a more appropriate method to check reltool's vsn
If running e.g. rebar generate using an OTP development build, rebar will complain that reltool has the version "", which is less than the required "0.5.2". This is because rebar_reltool simply checks the path returned by code:which(reltool), which doesn't yield version information if used in a development build. This patch substitutes a more robust method (load reltool and fetch the info from application:loaded_applications()). As it happens, this will not be enough to make things work, but now Reltool will explain that it cannot generate a spec from a system that is not installed, giving a better hint as to what needs to be done.
This commit is contained in:
parent
a8d11dc273
commit
6996cd4fcc
1 changed files with 14 additions and 13 deletions
|
@ -81,19 +81,20 @@ clean(Config, ReltoolFile) ->
|
|||
%% ===================================================================
|
||||
|
||||
check_vsn() ->
|
||||
case code:lib_dir(reltool) of
|
||||
{error, bad_name} ->
|
||||
?ABORT("Reltool support requires the reltool application "
|
||||
"to be installed!", []);
|
||||
Path ->
|
||||
ReltoolVsn = filename:basename(Path),
|
||||
case ReltoolVsn < "reltool-0.5.2" of
|
||||
true ->
|
||||
?ABORT("Reltool support requires at least reltool-0.5.2; "
|
||||
"this VM is using ~s\n", [ReltoolVsn]);
|
||||
false ->
|
||||
ok
|
||||
end
|
||||
application:load(reltool),
|
||||
ReltoolVsn =
|
||||
case lists:keysearch(reltool, 1, application:loaded_applications()) of
|
||||
{value, {_, _, V}} ->
|
||||
V;
|
||||
_ ->
|
||||
""
|
||||
end,
|
||||
case ReltoolVsn < "0.5.2" of
|
||||
true ->
|
||||
?ABORT("Reltool support requires at least reltool-0.5.2; "
|
||||
"this VM is using ~s\n", [ReltoolVsn]);
|
||||
false ->
|
||||
ok
|
||||
end.
|
||||
|
||||
process_overlay(ReltoolConfig) ->
|
||||
|
|
Loading…
Reference in a new issue