From ee47316113901fd81060497934eaa0f22a21bbc9 Mon Sep 17 00:00:00 2001
From: alisdair sullivan <alisdairsullivan@yahoo.ca>
Date: Sun, 15 May 2016 17:25:54 -0700
Subject: don't generated coverage for `extra_src_dirs`

closes #1057 and #1179
---
 src/rebar_prv_cover.erl | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/rebar_prv_cover.erl b/src/rebar_prv_cover.erl
index c915141..e555a9b 100644
--- a/src/rebar_prv_cover.erl
+++ b/src/rebar_prv_cover.erl
@@ -296,8 +296,7 @@ strip_coverdir(File) ->
 cover_compile(State, apps) ->
     Apps = filter_checkouts(rebar_state:project_apps(State)),
     AppDirs = app_dirs(Apps),
-    ExtraDirs = extra_src_dirs(State, Apps),
-    cover_compile(State, lists:filter(fun(D) -> ec_file:is_dir(D) end, AppDirs ++ ExtraDirs));
+    cover_compile(State, lists:filter(fun(D) -> ec_file:is_dir(D) end, AppDirs));
 cover_compile(State, Dirs) ->
     %% start the cover server if necessary
     {ok, CoverPid} = start_cover(),
@@ -322,21 +321,7 @@ app_dirs(Apps) ->
     lists:foldl(fun app_ebin_dirs/2, [], Apps).
 
 app_ebin_dirs(App, Acc) ->
-    AppDir = rebar_app_info:ebin_dir(App),
-    ExtraDirs = rebar_dir:extra_src_dirs(rebar_app_info:opts(App), []),
-    OutDir = rebar_app_info:out_dir(App),
-    [AppDir] ++ [filename:join([OutDir, D]) || D <- ExtraDirs] ++ Acc.
-
-extra_src_dirs(State, Apps) ->
-    BaseDir = rebar_state:dir(State),
-    F = fun(App) -> rebar_app_info:dir(App) == BaseDir end,
-    %% check that this app hasn't already been dealt with
-    Extras = case lists:any(F, Apps) of
-        false -> rebar_dir:extra_src_dirs(rebar_state:opts(State), []);
-        true  -> []
-    end,
-    OutDir = rebar_dir:base_dir(State),
-    [filename:join([OutDir, "extras", D]) || D <- Extras].
+    [rebar_app_info:ebin_dir(App)|Acc].
 
 filter_checkouts(Apps) -> filter_checkouts(Apps, []).
 
-- 
cgit v1.1