diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2018-04-27 09:35:46 -0400 |
|---|---|---|
| committer | Fred Hebert <mononcqc@ferd.ca> | 2018-04-27 09:35:46 -0400 |
| commit | 19d20c548e6866418113479dcbe60858ba8ecf11 (patch) | |
| tree | 7fd2e052524ef247f95076de06ab7dad7dba6c9e | |
| parent | 81bd21b23a1f45379f006d9d441c83151e4a1765 (diff) | |
| parent | 775261dd0b24d74e48f5873ef1ffff56c0c4829a (diff) | |
Merge branch 'danikp-feature_long_src_paths' of github.com:ferd/rebar3 into danikp-feature_long_src_paths
| -rw-r--r-- | src/rebar_prv_compile.erl | 5 | ||||
| -rw-r--r-- | test/rebar_dir_SUITE.erl | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/rebar_prv_compile.erl b/src/rebar_prv_compile.erl index 72320fb..1748118 100644 --- a/src/rebar_prv_compile.erl +++ b/src/rebar_prv_compile.erl @@ -236,7 +236,10 @@ copy_app_dirs(AppInfo, OldAppDir, AppDir) -> symlink_or_copy(OldAppDir, AppDir, Dir) -> Source = filename:join([OldAppDir, Dir]), Target = filename:join([AppDir, Dir]), - rebar_file_utils:symlink_or_copy(Source, Target). + case ec_file:is_dir(Source) of + true -> rebar_file_utils:symlink_or_copy(Source, Target); + false -> ok + end. copy(OldAppDir, AppDir, Dir) -> Source = filename:join([OldAppDir, Dir]), diff --git a/test/rebar_dir_SUITE.erl b/test/rebar_dir_SUITE.erl index f5ac0fc..81051e6 100644 --- a/test/rebar_dir_SUITE.erl +++ b/test/rebar_dir_SUITE.erl @@ -79,13 +79,10 @@ alt_src_dir_nested(Config) -> RebarConfig = [{src_dirs, ["src", "alt/nested"]}], AppsDir = ?config(apps, Config), Name1 = ?config(app_one, Config), - Name2 = ?config(app_two, Config), ModDir = filename:join([AppsDir, "apps", Name1, "alt", "nested"]), - ModDir2 = filename:join([AppsDir, "apps", Name2, "alt", "nested"]), Mod = "-module(altmod). -export([main/0]). main() -> ok.", ec_file:mkdir_path(ModDir), - ec_file:mkdir_path(ModDir2), ok = file:write_file(filename:join([ModDir, "altmod.erl"]), Mod), Ebin = filename:join([AppsDir, "_build", "default", "lib", Name1, "ebin", "altmod.beam"]), |