github/rebar
1
0
Fork 0
mirror of https://github.com/correl/rebar.git synced 2024-11-27 03:00:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Additional minor refactor in erlcinfo

Browse source 
- use filelib:last_modified/1 instead of date/0 and time/0 combo
  in source file vertices
- simplify store_erlcinfo/2
- document init_erlcinfo/2
This commit is contained in:
David Kubecka 2015-03-23 04:47:54 +01:00
parent 462962ebab
commit 9e33daa6fa
1 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/rebar_erlc_compiler.erl
View file

@ -397,6 +397,12 @@ needs_compile(Source, Target, Parents) ->
erlcinfo_file() -> erlcinfo_file() ->
filename:join([rebar_utils:get_cwd(), ".rebar", ?ERLCINFO_FILE]). filename:join([rebar_utils:get_cwd(), ".rebar", ?ERLCINFO_FILE]).
%% Get dependency graph of given Erls files and their dependencies (header files,
%% parse transforms, behaviours etc.) located in their directories or given
%% InclDirs. Note that last modification times stored in vertices are only for
%% internal optimization and cannot be directly used for deciding whether to
%% recompile a file, since when the file itself doesn't change we don't check its
%% dependencies which might change.
init_erlcinfo(InclDirs, Erls) -> init_erlcinfo(InclDirs, Erls) ->
G = digraph:new(), G = digraph:new(),
try restore_erlcinfo(G, InclDirs) try restore_erlcinfo(G, InclDirs)
@ -433,21 +439,20 @@ update_erlcinfo(G, Dirs, Source) ->
digraph:del_vertex(G, Source), digraph:del_vertex(G, Source),
modified; modified;
LastModified when LastUpdated < LastModified -> LastModified when LastUpdated < LastModified ->
modify_erlcinfo(G, Source, Dirs); modify_erlcinfo(G, Source, LastModified, Dirs);
_ -> _ ->
unmodified unmodified
end; end;
false -> false ->
modify_erlcinfo(G, Source, Dirs) modify_erlcinfo(G, Source, filelib:last_modified(Source), Dirs)
end. end.
modify_erlcinfo(G, Source, Dirs) -> modify_erlcinfo(G, Source, LastModified, Dirs) ->
{ok, Fd} = file:open(Source, [read]), {ok, Fd} = file:open(Source, [read]),
Incls = parse_attrs(Fd, []), Incls = parse_attrs(Fd, []),
AbsIncls = expand_file_names(Incls, Dirs), AbsIncls = expand_file_names(Incls, Dirs),
ok = file:close(Fd), ok = file:close(Fd),
LastUpdated = {date(), time()}, digraph:add_vertex(G, Source, LastModified),
digraph:add_vertex(G, Source, LastUpdated),
digraph:del_edges(G, digraph:out_edges(G, Source)), digraph:del_edges(G, digraph:out_edges(G, Source)),
lists:foreach( lists:foreach(
fun(Incl) -> fun(Incl) ->
@ -468,7 +473,7 @@ restore_erlcinfo(G, InclDirs) ->
digraph:add_vertex(G, V, LastUpdated) digraph:add_vertex(G, V, LastUpdated)
end, Vs), end, Vs),
lists:foreach( lists:foreach(
fun({V1, V2}) -> fun({_, V1, V2, _}) ->
digraph:add_edge(G, V1, V2) digraph:add_edge(G, V1, V2)
end, Es); end, Es);
{error, _} -> {error, _} ->
@ -476,18 +481,8 @@ restore_erlcinfo(G, InclDirs) ->
end. end.
store_erlcinfo(G, InclDirs) -> store_erlcinfo(G, InclDirs) ->
Vs = lists:map( Vs = lists:map(fun(V) -> digraph:vertex(G, V) end, digraph:vertices(G)),
fun(V) -> Es = lists:map(fun(E) -> digraph:edge(G, E) end, digraph:edges(G)),
digraph:vertex(G, V)
end, digraph:vertices(G)),
Es = lists:flatmap(
fun({V, _}) ->
lists:map(
fun(E) ->
{_, V1, V2, _} = digraph:edge(G, E),
{V1, V2}
end, digraph:out_edges(G, V))
end, Vs),
File = erlcinfo_file(), File = erlcinfo_file(),
ok = filelib:ensure_dir(File), ok = filelib:ensure_dir(File),
Data = term_to_binary(#erlcinfo{info={Vs, Es, InclDirs}}, [{compressed, 9}]), Data = term_to_binary(#erlcinfo{info={Vs, Es, InclDirs}}, [{compressed, 9}]),