mirror of
https://github.com/correl/rebar.git
synced 2025-04-07 17:00:11 -09:00
rebar_utils: refactor get_experimental and get_deprecated funs
This commit is contained in:
parent
75a6de27e7
commit
8f3873e061
1 changed files with 17 additions and 21 deletions
|
@ -45,7 +45,7 @@
|
||||||
vcs_vsn/3,
|
vcs_vsn/3,
|
||||||
deprecated/3, deprecated/4,
|
deprecated/3, deprecated/4,
|
||||||
get_deprecated_global/4, get_deprecated_global/5,
|
get_deprecated_global/4, get_deprecated_global/5,
|
||||||
get_experimental_global/3,
|
get_experimental_global/3, get_experimental_local/3,
|
||||||
get_deprecated_list/4, get_deprecated_list/5,
|
get_deprecated_list/4, get_deprecated_list/5,
|
||||||
get_deprecated_local/4, get_deprecated_local/5,
|
get_deprecated_local/4, get_deprecated_local/5,
|
||||||
delayed_halt/1,
|
delayed_halt/1,
|
||||||
|
@ -217,28 +217,14 @@ get_deprecated_global(Config, OldOpt, NewOpt, When) ->
|
||||||
get_deprecated_global(Config, OldOpt, NewOpt, undefined, When).
|
get_deprecated_global(Config, OldOpt, NewOpt, undefined, When).
|
||||||
|
|
||||||
get_deprecated_global(Config, OldOpt, NewOpt, Default, When) ->
|
get_deprecated_global(Config, OldOpt, NewOpt, Default, When) ->
|
||||||
case rebar_config:get_global(Config, NewOpt, Default) of
|
get_deprecated_3(fun rebar_config:get_global/3,
|
||||||
Default ->
|
Config, OldOpt, NewOpt, Default, When).
|
||||||
case rebar_config:get_global(Config, OldOpt, Default) of
|
|
||||||
Default ->
|
|
||||||
Default;
|
|
||||||
Old ->
|
|
||||||
deprecated(OldOpt, NewOpt, When),
|
|
||||||
Old
|
|
||||||
end;
|
|
||||||
New ->
|
|
||||||
New
|
|
||||||
end.
|
|
||||||
|
|
||||||
get_experimental_global(Config, Opt, Default) ->
|
get_experimental_global(Config, Opt, Default) ->
|
||||||
Val = rebar_config:get_global(Config, Opt, Default),
|
get_experimental_3(fun rebar_config:get_global/3, Config, Opt, Default).
|
||||||
case Val of
|
|
||||||
Default ->
|
get_experimental_local(Config, Opt, Default) ->
|
||||||
Default;
|
get_experimental_3(fun rebar_config:get_local/3, Config, Opt, Default).
|
||||||
Val ->
|
|
||||||
?CONSOLE("NOTICE: Using experimental option '~p'~n", [Opt]),
|
|
||||||
Val
|
|
||||||
end.
|
|
||||||
|
|
||||||
get_deprecated_list(Config, OldOpt, NewOpt, When) ->
|
get_deprecated_list(Config, OldOpt, NewOpt, When) ->
|
||||||
get_deprecated_list(Config, OldOpt, NewOpt, undefined, When).
|
get_deprecated_list(Config, OldOpt, NewOpt, undefined, When).
|
||||||
|
@ -350,6 +336,16 @@ get_deprecated_3(Get, Config, OldOpt, NewOpt, Default, When) ->
|
||||||
New
|
New
|
||||||
end.
|
end.
|
||||||
|
|
||||||
|
get_experimental_3(Get, Config, Opt, Default) ->
|
||||||
|
Val = Get(Config, Opt, Default),
|
||||||
|
case Val of
|
||||||
|
Default ->
|
||||||
|
Default;
|
||||||
|
Val ->
|
||||||
|
?CONSOLE("NOTICE: Using experimental option '~p'~n", [Opt]),
|
||||||
|
Val
|
||||||
|
end.
|
||||||
|
|
||||||
%% We do the shell variable substitution ourselves on Windows and hope that the
|
%% We do the shell variable substitution ourselves on Windows and hope that the
|
||||||
%% command doesn't use any other shell magic.
|
%% command doesn't use any other shell magic.
|
||||||
patch_on_windows(Cmd, Env) ->
|
patch_on_windows(Cmd, Env) ->
|
||||||
|
|
Loading…
Add table
Reference in a new issue