Pārlūkot izejas kodu

Merge pull request #1197 from zsoci/fixpathcmd

Fix path command to consider {deps_dir, "deps"} in rebar.config
pull/1201/head
Fred Hebert pirms 9 gadiem
vecāks
revīzija
41addaa53b
1 mainītis faili ar 4 papildinājumiem un 4 dzēšanām
  1. +4
    -4
      src/rebar_prv_path.erl

+ 4
- 4
src/rebar_prv_path.erl Parādīt failu

@ -77,15 +77,15 @@ paths([{rel, true}|Rest], Apps, State, Acc) ->
base_dir(State) -> io_lib:format("~s", [rebar_dir:base_dir(State)]). base_dir(State) -> io_lib:format("~s", [rebar_dir:base_dir(State)]).
bin_dir(State) -> io_lib:format("~s/bin", [rebar_dir:base_dir(State)]). bin_dir(State) -> io_lib:format("~s/bin", [rebar_dir:base_dir(State)]).
lib_dir(State) -> io_lib:format("~s/lib", [rebar_dir:base_dir(State)]).
lib_dir(State) -> io_lib:format("~s", [rebar_dir:deps_dir(State)]).
rel_dir(State) -> io_lib:format("~s/rel", [rebar_dir:base_dir(State)]). rel_dir(State) -> io_lib:format("~s/rel", [rebar_dir:base_dir(State)]).
ebin_dirs(Apps, State) -> ebin_dirs(Apps, State) ->
lists:map(fun(App) -> io_lib:format("~s/lib/~s/ebin", [rebar_dir:base_dir(State), App]) end, Apps).
lists:map(fun(App) -> io_lib:format("~s/~s/ebin", [rebar_dir:deps_dir(State), App]) end, Apps).
priv_dirs(Apps, State) -> priv_dirs(Apps, State) ->
lists:map(fun(App) -> io_lib:format("~s/lib/~s/priv", [rebar_dir:base_dir(State), App]) end, Apps).
lists:map(fun(App) -> io_lib:format("~s/~s/priv", [rebar_dir:deps_dir(State), App]) end, Apps).
src_dirs(Apps, State) -> src_dirs(Apps, State) ->
lists:map(fun(App) -> io_lib:format("~s/lib/~s/src", [rebar_dir:base_dir(State), App]) end, Apps).
lists:map(fun(App) -> io_lib:format("~s/~s/src", [rebar_dir:deps_dir(State), App]) end, Apps).
print_paths_if_exist(Paths, State) -> print_paths_if_exist(Paths, State) ->
{RawOpts, _} = rebar_state:command_parsed_args(State), {RawOpts, _} = rebar_state:command_parsed_args(State),

Notiek ielāde…
Atcelt
Saglabāt