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

Cleanup deprecations now that R14B04 is released

Browse source
This commit is contained in:
Tuncer Ayaz 2011-10-06 17:04:37 +02:00
parent b7bcf5528b
commit 5a0aa04b20
1 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/rebar_erlc_compiler.erl
View file

@ -70,13 +70,6 @@
-spec compile(Config::rebar_config:config(), AppFile::file:filename()) -> 'ok'. -spec compile(Config::rebar_config:config(), AppFile::file:filename()) -> 'ok'.
compile(Config, _AppFile) -> compile(Config, _AppFile) ->
?DEPRECATED(xrl_opts, fail_on_warning, warnings_as_errors,
rebar_config:get_list(Config, xrl_opts, []),
"once R14B04 is released"),
?DEPRECATED(yrl_opts, fail_on_warning, warnings_as_errors,
rebar_config:get_list(Config, yrl_opts, []),
"once R14B04 is released"),
rebar_base_compiler:run(Config, rebar_base_compiler:run(Config,
check_files(rebar_config:get_local( check_files(rebar_config:get_local(
Config, xrl_first_files, [])), Config, xrl_first_files, [])),
@ -287,15 +280,13 @@ compile_mib(Source, Target, Config) ->
-spec compile_xrl(Source::file:filename(), Target::file:filename(), -spec compile_xrl(Source::file:filename(), Target::file:filename(),
Config::rebar_config:config()) -> 'ok'. Config::rebar_config:config()) -> 'ok'.
compile_xrl(Source, Target, Config) -> compile_xrl(Source, Target, Config) ->
Opts = [{scannerfile, Target}, {return, true} Opts = [{scannerfile, Target} | rebar_config:get(Config, xrl_opts, [])],
| rebar_config:get(Config, xrl_opts, [])],
compile_xrl_yrl(Source, Target, Opts, leex). compile_xrl_yrl(Source, Target, Opts, leex).
-spec compile_yrl(Source::file:filename(), Target::file:filename(), -spec compile_yrl(Source::file:filename(), Target::file:filename(),
Config::rebar_config:config()) -> 'ok'. Config::rebar_config:config()) -> 'ok'.
compile_yrl(Source, Target, Config) -> compile_yrl(Source, Target, Config) ->
Opts = [{parserfile, Target}, {return, true} Opts = [{parserfile, Target} | rebar_config:get(Config, yrl_opts, [])],
| rebar_config:get(Config, yrl_opts, [])],
compile_xrl_yrl(Source, Target, Opts, yecc). compile_xrl_yrl(Source, Target, Opts, yecc).
-spec compile_xrl_yrl(Source::file:filename(), Target::file:filename(), -spec compile_xrl_yrl(Source::file:filename(), Target::file:filename(),
@ -304,16 +295,8 @@ compile_xrl_yrl(Source, Target, Opts, Mod) ->
case needs_compile(Source, Target, []) of case needs_compile(Source, Target, []) of
true -> true ->
case Mod:file(Source, Opts) of case Mod:file(Source, Opts) of
{ok, _, []} -> {ok, _} ->
ok; ok;
{ok, _, _Warnings} ->
%% TODO: remove once R14B04 is released
case lists:member(fail_on_warning, Opts) of
true ->
?FAIL;
false ->
ok
end;
_X -> _X ->
?FAIL ?FAIL
end; end;