mirror of
https://github.com/correl/rebar.git
synced 2024-11-15 03:00:18 +00:00
Check C source dependencies in needs_compile
This commit is contained in:
parent
29a16cbabe
commit
3a549d3e37
1 changed files with 29 additions and 6 deletions
|
@ -141,7 +141,8 @@ clean(Config, AppFile) ->
|
||||||
Specs ->
|
Specs ->
|
||||||
lists:foreach(fun(#spec{target=Target, objects=Objects}) ->
|
lists:foreach(fun(#spec{target=Target, objects=Objects}) ->
|
||||||
rebar_file_utils:delete_each([Target]),
|
rebar_file_utils:delete_each([Target]),
|
||||||
rebar_file_utils:delete_each(Objects)
|
rebar_file_utils:delete_each(Objects),
|
||||||
|
rebar_file_utils:delete_each(port_deps(Objects))
|
||||||
end, Specs)
|
end, Specs)
|
||||||
end,
|
end,
|
||||||
ok.
|
ok.
|
||||||
|
@ -251,9 +252,28 @@ exec_compiler(Config, Source, Cmd, ShOpts) ->
|
||||||
end.
|
end.
|
||||||
|
|
||||||
needs_compile(Source, Bin) ->
|
needs_compile(Source, Bin) ->
|
||||||
%% TODO: Generate depends using gcc -MM so we can also
|
needs_link(Bin, [Source|bin_deps(Bin)]).
|
||||||
%% check for include changes
|
|
||||||
filelib:last_modified(Bin) < filelib:last_modified(Source).
|
%% NOTE: This relies on -MMD being passed to the compiler and returns an
|
||||||
|
%% empty list if the .d file is not available. This means header deps are
|
||||||
|
%% ignored on win32.
|
||||||
|
bin_deps(Bin) ->
|
||||||
|
[DepFile] = port_deps([Bin]),
|
||||||
|
case file:read_file(DepFile) of
|
||||||
|
{ok, Deps} ->
|
||||||
|
Ds = parse_bin_deps(list_to_binary(Bin), Deps),
|
||||||
|
?DEBUG("Deps of ~p: ~p\n", [Bin, Ds]),
|
||||||
|
Ds;
|
||||||
|
{error, Err} ->
|
||||||
|
?DEBUG("Skipping deps parse of ~s: ~p\n", [DepFile, Err]),
|
||||||
|
[]
|
||||||
|
end.
|
||||||
|
|
||||||
|
parse_bin_deps(Bin, Deps) ->
|
||||||
|
Sz = size(Bin),
|
||||||
|
<<Bin:Sz/binary, ": ", X/binary>> = Deps,
|
||||||
|
Ds = re:split(X, "\\s*\\\\\\R\\s*|\\s+", [{return, binary}]),
|
||||||
|
[D || D <- Ds, D =/= <<>>].
|
||||||
|
|
||||||
needs_link(SoName, []) ->
|
needs_link(SoName, []) ->
|
||||||
filelib:last_modified(SoName) == 0;
|
filelib:last_modified(SoName) == 0;
|
||||||
|
@ -334,6 +354,9 @@ port_sources(Sources) ->
|
||||||
port_objects(SourceFiles) ->
|
port_objects(SourceFiles) ->
|
||||||
[replace_extension(O, ".o") || O <- SourceFiles].
|
[replace_extension(O, ".o") || O <- SourceFiles].
|
||||||
|
|
||||||
|
port_deps(SourceFiles) ->
|
||||||
|
[replace_extension(O, ".d") || O <- SourceFiles].
|
||||||
|
|
||||||
port_opts(Config, Opts) ->
|
port_opts(Config, Opts) ->
|
||||||
[port_opt(Config, O) || O <- Opts].
|
[port_opt(Config, O) || O <- Opts].
|
||||||
|
|
||||||
|
@ -560,9 +583,9 @@ default_env() ->
|
||||||
"$CC -c $CFLAGS $EXE_CFLAGS $PORT_IN_FILES -o $PORT_OUT_FILE"},
|
"$CC -c $CFLAGS $EXE_CFLAGS $PORT_IN_FILES -o $PORT_OUT_FILE"},
|
||||||
{"EXE_LINK_TEMPLATE",
|
{"EXE_LINK_TEMPLATE",
|
||||||
"$CC $PORT_IN_FILES $LDFLAGS $EXE_LDFLAGS -o $PORT_OUT_FILE"},
|
"$CC $PORT_IN_FILES $LDFLAGS $EXE_LDFLAGS -o $PORT_OUT_FILE"},
|
||||||
{"DRV_CFLAGS" , "-g -Wall -fPIC $ERL_CFLAGS"},
|
{"DRV_CFLAGS" , "-g -Wall -fPIC -MMD $ERL_CFLAGS"},
|
||||||
{"DRV_LDFLAGS", "-shared $ERL_LDFLAGS"},
|
{"DRV_LDFLAGS", "-shared $ERL_LDFLAGS"},
|
||||||
{"EXE_CFLAGS" , "-g -Wall -fPIC $ERL_CFLAGS"},
|
{"EXE_CFLAGS" , "-g -Wall -fPIC -MMD $ERL_CFLAGS"},
|
||||||
{"EXE_LDFLAGS", "$ERL_LDFLAGS"},
|
{"EXE_LDFLAGS", "$ERL_LDFLAGS"},
|
||||||
|
|
||||||
{"ERL_CFLAGS", lists:concat([" -I", erl_interface_dir(include),
|
{"ERL_CFLAGS", lists:concat([" -I", erl_interface_dir(include),
|
||||||
|
|
Loading…
Reference in a new issue