summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTuncer Ayaz <tuncer.ayaz@gmail.com>2011-12-12 17:14:24 +0100
committerTuncer Ayaz <tuncer.ayaz@gmail.com>2011-12-12 17:52:04 +0100
commitb1d84514f010aa3de32fda204207dec33c6f7a8c (patch)
treeea90bc5c2f300c8f5d2833bf2ac10f2b138594c2
parente33d3a568fe1583b783c4df4cc43758e19174137 (diff)
downloadrebar-b1d84514f010aa3de32fda204207dec33c6f7a8c.tar.gz
Add rebar_utils:deprecated/4 and remove define
-rw-r--r--include/rebar.hrl3
-rw-r--r--src/rebar_utils.erl17
2 files changed, 10 insertions, 10 deletions
diff --git a/include/rebar.hrl b/include/rebar.hrl
index a6534e1..0f4e90f 100644
--- a/include/rebar.hrl
+++ b/include/rebar.hrl
@@ -10,6 +10,3 @@
-define(ERROR(Str, Args), rebar_log:log(error, Str, Args)).
-define(FMT(Str, Args), lists:flatten(io_lib:format(Str, Args))).
-
--define(DEPRECATED(Key, Old, New, Opts, When),
- rebar_utils:deprecated(Key, Old, New, Opts, When)).
diff --git a/src/rebar_utils.erl b/src/rebar_utils.erl
index ddd5ddc..0265f45 100644
--- a/src/rebar_utils.erl
+++ b/src/rebar_utils.erl
@@ -42,7 +42,7 @@
find_executable/1,
prop_check/3,
expand_code_path/0,
- deprecated/5,
+ deprecated/4, deprecated/5,
expand_env_variable/3,
is_skipped_app/0
]).
@@ -326,12 +326,15 @@ emulate_escript_foldl(Fun, Acc, File) ->
deprecated(Key, Old, New, Opts, When) ->
case lists:member(Old, Opts) of
true ->
- io:format(
- <<"WARNING: deprecated ~p option used~n"
- "Option '~p' has been deprecated~n"
- "in favor of '~p'.~n"
- "'~p' will be removed ~s.~n~n">>,
- [Key, Old, New, Old, When]);
+ deprecated(Key, Old, New, When);
false ->
ok
end.
+
+deprecated(Key, Old, New, When) ->
+ io:format(
+ <<"WARNING: deprecated ~p option used~n"
+ "Option '~p' has been deprecated~n"
+ "in favor of '~p'.~n"
+ "'~p' will be removed ~s.~n~n">>,
+ [Key, Old, New, Old, When]).