diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2015-07-17 06:09:48 -0400 |
|---|---|---|
| committer | Fred Hebert <mononcqc@ferd.ca> | 2015-07-17 06:09:48 -0400 |
| commit | 0a4b43f6783f41bc464d4e55bc862fb6ee424292 (patch) | |
| tree | 40c09bf3148da7197d01bc6ed94d5108356ea998 /src | |
| parent | 88067b1b88e229290ff6e39e30ef680759de2e23 (diff) | |
| parent | 6f95911d3244c063222b4b4bcbb6c2e2271c5f4d (diff) | |
Merge pull request #619 from tsloughter/app_find
only look for top level apps and those directly under apps/ or lib/
Diffstat (limited to 'src')
| -rw-r--r-- | src/rebar.hrl | 2 | ||||
| -rw-r--r-- | src/rebar_app_discover.erl | 12 |
2 files changed, 3 insertions, 11 deletions
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). |