From 415d872730daf58a91b6fbd6d3eac1f015cb9c24 Mon Sep 17 00:00:00 2001
From: Jared Morrow <jared@basho.com>
Date: Tue, 11 Mar 2014 21:23:16 +0000
Subject: [PATCH] Keep compile recursive and update the tests to not pass -r to
 compile

---
 ebin/rebar.app                           | 3 ++-
 inttest/depplugins/depplugins_rt.erl     | 2 +-
 inttest/tdeps1/tdeps1_rt.erl             | 2 +-
 inttest/tdeps2/tdeps2_rt.erl             | 2 +-
 inttest/tdeps_update/tdeps_update_rt.erl | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ebin/rebar.app b/ebin/rebar.app
index 2aae95e..6b4702a 100644
--- a/ebin/rebar.app
+++ b/ebin/rebar.app
@@ -92,9 +92,10 @@
                               ]}
                    ]},
          {recursive_cmds, [
-                           'get-deps',
                            'check-deps',
+                           'compile',
                            'delete-deps',
+                           'get-deps',
                            'list-deps',
                            'update-deps'
                           ]}
diff --git a/inttest/depplugins/depplugins_rt.erl b/inttest/depplugins/depplugins_rt.erl
index 686d719..a45fa93 100644
--- a/inttest/depplugins/depplugins_rt.erl
+++ b/inttest/depplugins/depplugins_rt.erl
@@ -39,7 +39,7 @@ files() ->
     ].
 
 run(_Dir) ->
-    ?assertMatch({ok, _}, retest_sh:run("./rebar -r compile", [])),
+    ?assertMatch({ok, _}, retest_sh:run("./rebar compile", [])),
 
     ?assertEqual(true, filelib:is_regular("base_dir_cwd_pre.compile")),
 
diff --git a/inttest/tdeps1/tdeps1_rt.erl b/inttest/tdeps1/tdeps1_rt.erl
index 425402f..a72cc83 100644
--- a/inttest/tdeps1/tdeps1_rt.erl
+++ b/inttest/tdeps1/tdeps1_rt.erl
@@ -42,7 +42,7 @@ run(_Dir) ->
     apply_cmds(GitCmds, [{dir, "repo/c"}]),
 
     {ok, _} = retest_sh:run("./rebar get-deps", []),
-    {ok, _} = retest_sh:run("./rebar -r compile", []),
+    {ok, _} = retest_sh:run("./rebar compile", []),
 
     true = filelib:is_regular("ebin/a.beam"),
     ok.
diff --git a/inttest/tdeps2/tdeps2_rt.erl b/inttest/tdeps2/tdeps2_rt.erl
index 61fc42b..22f0abe 100644
--- a/inttest/tdeps2/tdeps2_rt.erl
+++ b/inttest/tdeps2/tdeps2_rt.erl
@@ -50,7 +50,7 @@ run(_Dir) ->
     ok = apply_cmds(GitCmds, [{dir, "repo/c"}]),
 
     {ok, _} = retest_sh:run("./rebar -v get-deps", []),
-    {ok, _} = retest_sh:run("./rebar -v -r compile", []),
+    {ok, _} = retest_sh:run("./rebar -v compile", []),
     ok.
 
 %%
diff --git a/inttest/tdeps_update/tdeps_update_rt.erl b/inttest/tdeps_update/tdeps_update_rt.erl
index 3a0d9bb..e182ae2 100644
--- a/inttest/tdeps_update/tdeps_update_rt.erl
+++ b/inttest/tdeps_update/tdeps_update_rt.erl
@@ -123,7 +123,7 @@ run(_Dir) ->
     ok = apply_cmds(GitCmds++FCmds, [{dir, "repo/f"}]),
 
     {ok, _} = retest_sh:run("./rebar -v get-deps", []),
-    {ok, _} = retest_sh:run("./rebar -v -r compile", []),
+    {ok, _} = retest_sh:run("./rebar -v compile", []),
     os:cmd("cp a2.rebar.config apps/a1/rebar.config"),
     {ok, _} = retest_sh:run("./rebar -v update-deps", []),
     {ok, _} = retest_sh:run("./rebar -v compile", []),