Преглед на файлове

Merge branch 'danikp-feature_long_src_paths' of github.com:ferd/rebar3 into danikp-feature_long_src_paths

pull/1770/head
Fred Hebert преди 7 години
родител
ревизия
19d20c548e
променени са 2 файла, в които са добавени 4 реда и са изтрити 4 реда
  1. +4
    -1
      src/rebar_prv_compile.erl
  2. +0
    -3
      test/rebar_dir_SUITE.erl

+ 4
- 1
src/rebar_prv_compile.erl Целия файл

@ -236,7 +236,10 @@ copy_app_dirs(AppInfo, OldAppDir, AppDir) ->
symlink_or_copy(OldAppDir, AppDir, Dir) -> symlink_or_copy(OldAppDir, AppDir, Dir) ->
Source = filename:join([OldAppDir, Dir]), Source = filename:join([OldAppDir, Dir]),
Target = filename:join([AppDir, 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) -> copy(OldAppDir, AppDir, Dir) ->
Source = filename:join([OldAppDir, Dir]), Source = filename:join([OldAppDir, Dir]),

+ 0
- 3
test/rebar_dir_SUITE.erl Целия файл

@ -79,13 +79,10 @@ alt_src_dir_nested(Config) ->
RebarConfig = [{src_dirs, ["src", "alt/nested"]}], RebarConfig = [{src_dirs, ["src", "alt/nested"]}],
AppsDir = ?config(apps, Config), AppsDir = ?config(apps, Config),
Name1 = ?config(app_one, Config), Name1 = ?config(app_one, Config),
Name2 = ?config(app_two, Config),
ModDir = filename:join([AppsDir, "apps", Name1, "alt", "nested"]), ModDir = filename:join([AppsDir, "apps", Name1, "alt", "nested"]),
ModDir2 = filename:join([AppsDir, "apps", Name2, "alt", "nested"]),
Mod = "-module(altmod). -export([main/0]). main() -> ok.", Mod = "-module(altmod). -export([main/0]). main() -> ok.",
ec_file:mkdir_path(ModDir), ec_file:mkdir_path(ModDir),
ec_file:mkdir_path(ModDir2),
ok = file:write_file(filename:join([ModDir, "altmod.erl"]), Mod), ok = file:write_file(filename:join([ModDir, "altmod.erl"]), Mod),
Ebin = filename:join([AppsDir, "_build", "default", "lib", Name1, "ebin", "altmod.beam"]), Ebin = filename:join([AppsDir, "_build", "default", "lib", Name1, "ebin", "altmod.beam"]),

Зареждане…
Отказ
Запис