Add a is_umbrella config option

Author: jiahuili430

src/rebar.hrl

@@ -14,8 +14,9 @@
 
 -define(DEFAULT_BASE_DIR, "_build").
 -define(DEFAULT_ROOT_DIR, ".").
--define(DEFAULT_PROJECT_APP_DIRS, ["apps/*", "lib/*", "."]).
+-define(DEFAULT_PROJECT_APP_DIRS, ["apps/*", "lib/*", ".", "src/*"]).
 -define(DEFAULT_PROJECT_PLUGIN_DIRS, ["plugins/*"]).
+-define(DEFAULT_UMBRELLA, false).
 -define(DEFAULT_CHECKOUTS_DIR, "_checkouts").
 -define(DEFAULT_CHECKOUTS_OUT_DIR, "checkouts").
 -define(DEFAULT_DEPS_DIR, "lib").

src/rebar_plugins.erl

@@ -221,6 +221,7 @@ discover_plugins(State) ->
     end.
 
 is_umbrella(State) ->
+    io:format(" +++ rebar_state:get(State, is_umbrella):~p~n~n", [rebar_state:get(State, is_umbrella, ?DEFAULT_UMBRELLA)]),
     %% We can't know if this is an umbrella project before running app discovery,
     %% but plugins are installed before app discovery. So we do a heuristic.
     %% The lib dirs we search contain things such as apps/, lib/, etc.
@@ -231,16 +232,24 @@ is_umbrella(State) ->
     %% So what we do here is look for the library directories without the ".",
     %% and if none of these paths exist but one of the src_dirs exist, then
     %% we know this is not an umbrella application.
-    case rebar_dir:lib_dirs(State) of
-        ?DEFAULT_PROJECT_APP_DIRS ->
+    case rebar_state:get(State, is_umbrella, ?DEFAULT_UMBRELLA) of
+        ?DEFAULT_UMBRELLA ->
             Root = rebar_dir:root_dir(State),
             LibPaths = lists:usort(rebar_dir:lib_dirs(State)) -- ["."],
             SrcPaths = rebar_dir:src_dirs(rebar_state:opts(State), ["src"]),
+            io:format(" +++ Root:~p~n~n", [Root]),
+            io:format(" +++ LibPaths:~p~n~n", [LibPaths]),
+            io:format(" +++ SrcPaths:~p~n~n", [SrcPaths]),
+            io:format(" +++ rebar_dir:src_dirs(rebar_state:opts(State), [src]):~p~n~n", [rebar_dir:src_dirs(rebar_state:opts(State), ["src"])]),
+            io:format(" +++ lists:map(fun(Dir) -> filelib:wildcard(filename:join(Root, Dir)) end, LibPaths):~p~n~n", [lists:map(fun(Dir) -> filelib:wildcard(filename:join(Root, Dir)) end, LibPaths)]),
+            io:format(" +++ lists:map(fun(Dir) -> filename:join(Root, Dir) end, SrcPaths):~p~n~n", [lists:map(fun(Dir) -> filename:join(Root, Dir) end, SrcPaths)]),
+            io:format(" +++ lists:any(fun(Dir) -> [] == filelib:wildcard(filename:join(Root, Dir)) end, LibPaths):~p~n~n", [lists:any(fun(Dir) -> [] == filelib:wildcard(filename:join(Root, Dir)) end, LibPaths)]),
+            io:format(" +++ lists:all(fun(Dir) -> not filelib:is_dir(filename:join(Root, Dir)) end, SrcPaths):~p~n~n", [lists:all(fun(Dir) -> not filelib:is_dir(filename:join(Root, Dir)) end, SrcPaths)]),
             lists:any(fun(Dir) -> [] == filelib:wildcard(filename:join(Root, Dir)) end, LibPaths)
-                andalso
+            andalso
             lists:all(fun(Dir) -> not filelib:is_dir(filename:join(Root, Dir)) end, SrcPaths);
-        _ ->
-            true
+        true -> true
+    end.
     end.
 
 prepare_plugin(AppInfo) ->