瀏覽代碼

Merge pull request #357 from tsloughter/erl_first_files

fix erl_first_files to check entire path of file
pull/361/head
Fred Hebert 10 年之前
父節點
當前提交
31ef4c4916
共有 1 個檔案被更改,包括 4 行新增3 行删除
  1. +4
    -3
      src/rebar_erlc_compiler.erl

+ 4
- 3
src/rebar_erlc_compiler.erl 查看文件

@ -161,7 +161,7 @@ doterl_compile(Config, Dir, OutDir, MoreSources, ErlOpts) ->
filename:extension(File) =:= ".erl"],
NeededErlFiles = needed_files(G, ErlOpts, Dir, OutDir1, AllErlFiles),
ErlFirstFiles = erl_first_files(Config, NeededErlFiles),
ErlFirstFiles = erl_first_files(Config, Dir, NeededErlFiles),
{DepErls, OtherErls} = lists:partition(
fun(Source) -> digraph:in_degree(G, Source) > 0 end,
[File || File <- NeededErlFiles, not lists:member(File, ErlFirstFiles)]),
@ -176,10 +176,11 @@ doterl_compile(Config, Dir, OutDir, MoreSources, ErlOpts) ->
true = code:set_path(CurrPath),
ok.
erl_first_files(Config, NeededErlFiles) ->
erl_first_files(Config, Dir, NeededErlFiles) ->
ErlFirstFilesConf = rebar_state:get(Config, erl_first_files, []),
%% NOTE: order of files in ErlFirstFiles is important!
[File || File <- ErlFirstFilesConf, lists:member(File, NeededErlFiles)].
[filename:join(Dir, File) || File <- ErlFirstFilesConf,
lists:member(filename:join(Dir, File), NeededErlFiles)].
%% Get subset of SourceFiles which need to be recompiled, respecting
%% dependencies induced by given graph G.

Loading…
取消
儲存