From 26192b2187bbb93df28ed7b603b26e49f04badc7 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Sat, 8 Nov 2014 17:42:15 -0600 Subject: pass deps dir of project to relx --- src/rebar_prv_release.erl | 5 +++-- src/rebar_prv_tar.erl | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/rebar_prv_release.erl b/src/rebar_prv_release.erl index f631499..3ac826e 100644 --- a/src/rebar_prv_release.erl +++ b/src/rebar_prv_release.erl @@ -33,13 +33,14 @@ init(State) -> -spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}. do(State) -> Options = rebar_state:command_args(State), + DepsDir = rebar_prv_install_deps:get_deps_dir(State), AllOptions = string:join(["release" | Options], " "), try case rebar_state:get(State, relx, []) of [] -> - relx:main(AllOptions); + relx:main([{lib_dirs, [DepsDir]}], AllOptions); Config -> - relx:main([{config, Config}], AllOptions) + relx:main([{lib_dirs, [DepsDir]}, {config, Config}], AllOptions) end, {ok, State} catch diff --git a/src/rebar_prv_tar.erl b/src/rebar_prv_tar.erl index ec1b8a3..184a1b4 100644 --- a/src/rebar_prv_tar.erl +++ b/src/rebar_prv_tar.erl @@ -33,12 +33,13 @@ init(State) -> -spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}. do(State) -> Options = rebar_state:command_args(State), + DepsDir = rebar_prv_install_deps:get_deps_dir(State), AllOptions = string:join(["release", "tar" | Options], " "), case rebar_state:get(State, relx, []) of [] -> - relx:main(AllOptions); + relx:main([{lib_dirs, [DepsDir]}], AllOptions); Config -> - relx:main([{config, Config}], AllOptions) + relx:main([{lib_dirs, [DepsDir]}, {config, Config}], AllOptions) end, {ok, State}. -- cgit v1.1