summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFred Hebert <mononcqc@ferd.ca>2018-04-27 10:22:07 -0400
committerFred Hebert <mononcqc@ferd.ca>2018-04-27 10:22:07 -0400
commit0af9aba244dd10d8fdcb8520057cf8a4dcdd90bf (patch)
treef40b11f47c1d57cd9614582d36b89b6f423227e4 /src
parent19d20c548e6866418113479dcbe60858ba8ecf11 (diff)
Fix symlink/copying logic in compiler for priv
Priv and include dirs need the virtual symlink in order to preserve hook functionality in some edge cases.
Diffstat (limited to 'src')
-rw-r--r--src/rebar_prv_compile.erl11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/rebar_prv_compile.erl b/src/rebar_prv_compile.erl
index 1748118..0b4fa5f 100644
--- a/src/rebar_prv_compile.erl
+++ b/src/rebar_prv_compile.erl
@@ -225,7 +225,11 @@ copy_app_dirs(AppInfo, OldAppDir, AppDir) ->
end,
{SrcDirs, ExtraDirs} = resolve_src_dirs(rebar_app_info:opts(AppInfo)),
%% link to src_dirs to be adjacent to ebin is needed for R15 use of cover/xref
- [symlink_or_copy(OldAppDir, AppDir, Dir) || Dir <- ["priv", "include"] ++ SrcDirs],
+ %% priv/ and include/ are symlinked unconditionally to allow hooks
+ %% to write to them _after_ compilation has taken place when the
+ %% initial directory did not, and still work
+ [symlink_or_copy(OldAppDir, AppDir, Dir) || Dir <- ["priv", "include"]],
+ [symlink_or_copy_existing(OldAppDir, AppDir, Dir) || Dir <- SrcDirs],
%% copy all extra_src_dirs as they build into themselves and linking means they
%% are shared across profiles
[copy(OldAppDir, AppDir, Dir) || Dir <- ExtraDirs];
@@ -236,6 +240,11 @@ 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).
+
+symlink_or_copy_existing(OldAppDir, AppDir, Dir) ->
+ Source = filename:join([OldAppDir, Dir]),
+ Target = filename:join([AppDir, Dir]),
case ec_file:is_dir(Source) of
true -> rebar_file_utils:symlink_or_copy(Source, Target);
false -> ok