From b1d84514f010aa3de32fda204207dec33c6f7a8c Mon Sep 17 00:00:00 2001
From: Tuncer Ayaz <tuncer.ayaz@gmail.com>
Date: Mon, 12 Dec 2011 17:14:24 +0100
Subject: [PATCH] Add rebar_utils:deprecated/4 and remove define

---
 include/rebar.hrl   |  3 ---
 src/rebar_utils.erl | 17 ++++++++++-------
 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]).