From ae7d1ca1ea9e4ec12a82d6d4510856500964778b Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Sat, 25 Apr 2015 11:29:10 -0500 Subject: include _checkouts in release lib dirs if it exists --- src/rebar_prv_release.erl | 3 ++- src/rebar_prv_tar.erl | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/rebar_prv_release.erl b/src/rebar_prv_release.erl index c9a9c0b..595280c 100644 --- a/src/rebar_prv_release.erl +++ b/src/rebar_prv_release.erl @@ -35,8 +35,9 @@ do(State) -> Caller = rebar_state:get(State, caller, api), Options = rebar_state:command_args(State), DepsDir = rebar_dir:deps_dir(State), + ProjectAppDirs = lists:delete(".", ?DEFAULT_PROJECT_APP_DIRS), LibDirs = rebar_utils:filtermap(fun ec_file:exists/1, - [DepsDir | lists:delete(".", ?DEFAULT_PROJECT_APP_DIRS)]), + [?DEFAULT_CHECKOUTS_DIR, DepsDir | ProjectAppDirs]), OutputDir = filename:join(rebar_dir:base_dir(State), ?DEFAULT_RELEASE_DIR), AllOptions = string:join(["release" | Options], " "), try diff --git a/src/rebar_prv_tar.erl b/src/rebar_prv_tar.erl index 019036e..f7557bd 100644 --- a/src/rebar_prv_tar.erl +++ b/src/rebar_prv_tar.erl @@ -35,8 +35,9 @@ do(State) -> Caller = rebar_state:get(State, caller, api), Options = rebar_state:command_args(State), DepsDir = rebar_dir:deps_dir(State), + ProjectAppDirs = lists:delete(".", ?DEFAULT_PROJECT_APP_DIRS), LibDirs = rebar_utils:filtermap(fun ec_file:exists/1, - [DepsDir | lists:delete(".", ?DEFAULT_PROJECT_APP_DIRS)]), + [?DEFAULT_CHECKOUTS_DIR, DepsDir | ProjectAppDirs]), OutputDir = filename:join(rebar_dir:base_dir(State), ?DEFAULT_RELEASE_DIR), AllOptions = string:join(["release", "tar" | Options], " "), case rebar_state:get(State, relx, []) of -- cgit v1.1