From 6f95911d3244c063222b4b4bcbb6c2e2271c5f4d Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Thu, 16 Jul 2015 22:17:31 -0500
Subject: only look for top level apps and those directly under apps/ or lib/

---
 src/rebar.hrl              |  2 +-
 src/rebar_app_discover.erl | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/rebar.hrl b/src/rebar.hrl
index 4540b1a..8a702df 100644
--- a/src/rebar.hrl
+++ b/src/rebar.hrl
@@ -15,7 +15,7 @@
 
 -define(DEFAULT_BASE_DIR, "_build").
 -define(DEFAULT_ROOT_DIR, ".").
--define(DEFAULT_PROJECT_APP_DIRS, ["apps", "lib", "."]).
+-define(DEFAULT_PROJECT_APP_DIRS, ["apps/*", "lib/*", "."]).
 -define(DEFAULT_CHECKOUTS_DIR, "_checkouts").
 -define(DEFAULT_DEPS_DIR, "lib").
 -define(DEFAULT_PLUGINS_DIR, "plugins").
diff --git a/src/rebar_app_discover.erl b/src/rebar_app_discover.erl
index 9c4a5ff..f55a4d5 100644
--- a/src/rebar_app_discover.erl
+++ b/src/rebar_app_discover.erl
@@ -94,25 +94,17 @@ all_app_dirs(LibDirs) ->
 
 app_dirs(LibDir) ->
     Path1 = filename:join([LibDir,
-                           "*",
-                           "src",
-                           "*.app.src"]),
-    Path2 = filename:join([LibDir,
                            "src",
                            "*.app.src"]),
 
-    Path3 = filename:join([LibDir,
-                           "*",
-                           "ebin",
-                           "*.app"]),
-    Path4 = filename:join([LibDir,
+    Path2 = filename:join([LibDir,
                            "ebin",
                            "*.app"]),
 
     lists:usort(lists:foldl(fun(Path, Acc) ->
                                     Files = filelib:wildcard(ec_cnv:to_list(Path)),
                                     [app_dir(File) || File <- Files] ++ Acc
-                            end, [], [Path1, Path2, Path3, Path4])).
+                            end, [], [Path1, Path2])).
 
 find_unbuilt_apps(LibDirs) ->
     find_apps(LibDirs, invalid).
-- 
cgit v1.1