Permalink
Browse files

Re-use rebar_utils:ebin_dir()

  • Loading branch information...
1 parent e2492eb commit 491d52298e270c30901d2cf6e218e8cb0247f068 @tuncer tuncer committed Aug 6, 2012
Showing with 4 additions and 10 deletions.
  1. +1 −4 src/rebar_edoc.erl
  2. +1 −1 src/rebar_erlydtl_compiler.erl
  3. +1 −4 src/rebar_shell.erl
  4. +1 −1 src/rebar_xref.erl
View
@@ -87,12 +87,9 @@ setup_code_path() ->
%% and the like can work properly when generating their own
%% documentation.
CodePath = code:get_path(),
- true = code:add_patha(ebin_dir()),
+ true = code:add_patha(rebar_utils:ebin_dir()),
CodePath.
-ebin_dir() ->
- filename:join(rebar_utils:get_cwd(), "ebin").
-
newer_file_exists(Paths, LastMod) ->
CheckFile = fun(Filename, _) ->
FLast = filelib:last_modified(Filename),
@@ -83,7 +83,7 @@
compile(Config, _AppFile) ->
DtlOpts = erlydtl_opts(Config),
OrigPath = code:get_path(),
- true = code:add_path(filename:join(rebar_utils:get_cwd(), "ebin")),
+ true = code:add_path(rebar_utils:ebin_dir()),
Result = rebar_base_compiler:run(Config, [],
option(doc_root, DtlOpts),
option(source_ext, DtlOpts),
View
@@ -38,7 +38,7 @@ shell(_Config, _AppFile) ->
%% for the "top level" directory
case is_deps_dir(rebar_utils:get_cwd()) of
false ->
- true = code:add_pathz(ebin_dir()),
+ true = code:add_pathz(rebar_utils:ebin_dir()),
user_drv:start(),
%% this call never returns (until user quits shell)
shell:server(false, false);
@@ -47,9 +47,6 @@ shell(_Config, _AppFile) ->
end,
ok.
-ebin_dir() ->
- filename:join(rebar_utils:get_cwd(), "ebin").
-
is_deps_dir(Dir) ->
case lists:reverse(filename:split(Dir)) of
[_, "deps" | _] ->
View
@@ -53,7 +53,7 @@ xref(Config, _) ->
%% Save the code path prior to doing anything
OrigPath = code:get_path(),
- true = code:add_path(filename:join(rebar_utils:get_cwd(), "ebin")),
+ true = code:add_path(rebar_utils:ebin_dir()),
%% Get list of xref checks we want to run
XrefChecks = rebar_config:get(Config, xref_checks,

0 comments on commit 491d522

Please sign in to comment.