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

Merge pull request #234 from tuncer/fix-220

Browse source 
Fix #220 (Reported-by: Joseph Norton)
This commit is contained in:
Andrew Thompson 2014-03-05 14:54:27 -05:00
commit ab571fd2aa
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/rebar_erlc_compiler.erl
View file

@ -146,12 +146,13 @@ test_compile(Config, Cmd, OutDir) ->
lists:append(Acc, Files) lists:append(Acc, Files)
end, [], SrcDirs), end, [], SrcDirs),
%% If it is not the first time rebar eunit is executed, there will be source %% If it is not the first time rebar eunit or rebar qc is executed,
%% files already present in OutDir. Since some SCMs (like Perforce) set %% there will be source files already present in OutDir. Since some
%% the source files as being read only (unless they are checked out), we %% SCMs (like Perforce) set the source files as being read only (unless
%% need to be sure that the files already present in OutDir are writable %% they are checked out), we need to be sure that the files already
%% before doing the copy. This is done here by removing any file that was %% present in OutDir are writable before doing the copy. This is done
%% already present before calling rebar_file_utils:cp_r. %% here by removing any file that was already present before calling
%% rebar_file_utils:cp_r.
%% Get the full path to a file that was previously copied in OutDir %% Get the full path to a file that was previously copied in OutDir
ToCleanUp = fun(F, Acc) -> ToCleanUp = fun(F, Acc) ->
@ -172,7 +173,7 @@ test_compile(Config, Cmd, OutDir) ->
%% with appropriate defines for eunit, and include all the test modules %% with appropriate defines for eunit, and include all the test modules
%% as well. %% as well.
ok = doterl_compile(test_compile_config(Config, ErlOpts, Cmd), ok = doterl_compile(test_compile_config(Config, ErlOpts, Cmd),
OutDir, TestErls), OutDir, TestErls, ErlOpts),
{ok, SrcErls}. {ok, SrcErls}.
@ -271,11 +272,11 @@ is_lib_avail(Config, DictKey, Mod, Hrl, Name) ->
-spec doterl_compile(rebar_config:config(), file:filename()) -> 'ok'. -spec doterl_compile(rebar_config:config(), file:filename()) -> 'ok'.
doterl_compile(Config, OutDir) -> doterl_compile(Config, OutDir) ->
doterl_compile(Config, OutDir, []).
doterl_compile(Config, OutDir, MoreSources) ->
ErlFirstFiles = rebar_config:get_list(Config, erl_first_files, []),
ErlOpts = rebar_utils:erl_opts(Config), ErlOpts = rebar_utils:erl_opts(Config),
doterl_compile(Config, OutDir, [], ErlOpts).
doterl_compile(Config, OutDir, MoreSources, ErlOpts) ->
ErlFirstFiles = rebar_config:get_list(Config, erl_first_files, []),
?DEBUG("erl_opts ~p~n", [ErlOpts]), ?DEBUG("erl_opts ~p~n", [ErlOpts]),
%% Support the src_dirs option allowing multiple directories to %% Support the src_dirs option allowing multiple directories to
%% contain erlang source. This might be used, for example, should %% contain erlang source. This might be used, for example, should