diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2015-04-25 12:50:16 -0400 |
|---|---|---|
| committer | Fred Hebert <mononcqc@ferd.ca> | 2015-04-25 12:50:16 -0400 |
| commit | 212b23b889c0189d3f609d5a16781f6acbadf824 (patch) | |
| tree | ec080ff0d93405e86b35a7be3fc8aa0e1ddf7f7f /src | |
| parent | 521fc144ae1243f2a91008fbec8fe9e5c3996bfb (diff) | |
| parent | ae7d1ca1ea9e4ec12a82d6d4510856500964778b (diff) | |
Merge pull request #373 from tsloughter/checkouts_rel
include _checkouts in release lib dirs if it exists
Diffstat (limited to 'src')
| -rw-r--r-- | src/rebar_prv_release.erl | 3 | ||||
| -rw-r--r-- | 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 |