From 636c02f0be021b5d56fd29a562f80ed0f5cdff46 Mon Sep 17 00:00:00 2001 From: Tuncer Ayaz Date: Sat, 28 Jul 2012 19:51:57 +0200 Subject: [PATCH] Fix R13B03 build (Reported-by: Sergey Nartimov) --- include/rebar.hrl | 3 +-- src/rebar_abnfc_compiler.erl | 4 ++-- src/rebar_asn1_compiler.erl | 2 +- src/rebar_base_compiler.erl | 6 +++--- src/rebar_core.erl | 8 ++++---- src/rebar_ct.erl | 8 ++++---- src/rebar_deps.erl | 2 +- src/rebar_erlc_compiler.erl | 2 +- src/rebar_erlydtl_compiler.erl | 4 ++-- src/rebar_escripter.erl | 4 ++-- src/rebar_eunit.erl | 2 +- src/rebar_file_utils.erl | 2 +- src/rebar_lfe_compiler.erl | 4 ++-- src/rebar_neotoma_compiler.erl | 4 ++-- src/rebar_otp_app.erl | 8 ++++---- src/rebar_port_compiler.erl | 2 +- src/rebar_protobuffs_compiler.erl | 4 ++-- src/rebar_reltool.erl | 8 ++++---- src/rebar_xref.erl | 2 +- 19 files changed, 39 insertions(+), 40 deletions(-) diff --git a/include/rebar.hrl b/include/rebar.hrl index e84bb69..bc46b1d 100644 --- a/include/rebar.hrl +++ b/include/rebar.hrl @@ -1,5 +1,4 @@ - --define(ABORT, rebar_utils:abort()). +-define(FAIL, rebar_utils:abort()). -define(ABORT(Str, Args), rebar_utils:abort(Str, Args)). -define(CONSOLE(Str, Args), io:format(Str, Args)). diff --git a/src/rebar_abnfc_compiler.erl b/src/rebar_abnfc_compiler.erl index cb56854..0e6749a 100644 --- a/src/rebar_abnfc_compiler.erl +++ b/src/rebar_abnfc_compiler.erl @@ -90,7 +90,7 @@ compile_abnfc(Source, _Target, Config) -> " https://github.com/nygge/abnfc~n" " and install it into your erlang library dir~n" "===============================================~n~n", []), - ?ABORT; + ?FAIL; true -> AbnfcOpts = abnfc_opts(Config), SourceExt = option(source_ext, AbnfcOpts), @@ -103,6 +103,6 @@ compile_abnfc(Source, _Target, Config) -> Error -> ?ERROR("Compiling grammar ~s failed:~n ~p~n", [Source, Error]), - ?ABORT + ?FAIL end end. diff --git a/src/rebar_asn1_compiler.erl b/src/rebar_asn1_compiler.erl index c9dca1f..40129c9 100644 --- a/src/rebar_asn1_compiler.erl +++ b/src/rebar_asn1_compiler.erl @@ -65,7 +65,7 @@ compile_asn1(Source, Target, Config) -> ok end; {error, _Reason} -> - ?ABORT + ?FAIL end. asn_generated_files(AsnDir, SrcDir, IncDir) -> diff --git a/src/rebar_base_compiler.erl b/src/rebar_base_compiler.erl index 89aab07..c2ebf51 100644 --- a/src/rebar_base_compiler.erl +++ b/src/rebar_base_compiler.erl @@ -141,7 +141,7 @@ compile_each([Source | Rest], Config, CompileFn) -> Error -> maybe_report(Error), ?DEBUG("Compilation failed: ~p\n", [Error]), - ?ABORT + ?FAIL end, compile_each(Rest, Config, CompileFn). @@ -162,7 +162,7 @@ compile_queue(Pids, Targets) -> {fail, Error} -> maybe_report(Error), ?DEBUG("Worker compilation failed: ~p\n", [Error]), - ?ABORT; + ?FAIL; {compiled, Source, Warnings} -> report(Warnings), @@ -184,7 +184,7 @@ compile_queue(Pids, Targets) -> {'DOWN', _Mref, _, _Pid, Info} -> ?DEBUG("Worker failed: ~p\n", [Info]), - ?ABORT + ?FAIL end. compile_worker(QueuePid, Config, CompileFn) -> diff --git a/src/rebar_core.erl b/src/rebar_core.erl index a56ba1a..e4755b1 100644 --- a/src/rebar_core.erl +++ b/src/rebar_core.erl @@ -39,10 +39,10 @@ process_commands([], ParentConfig) -> case {get_operations(ParentConfig), AbortTrapped} of {0, _} -> %% None of the commands had any effect - ?ABORT; + ?FAIL; {_, true} -> %% An abort was previously trapped - ?ABORT; + ?FAIL; _ -> ok end; @@ -77,7 +77,7 @@ process_commands([Command | Rest], ParentConfig) -> throw:rebar_abort -> case rebar_config:get_xconf(ParentConfig1, keep_going, false) of false -> - ?ABORT; + ?FAIL; true -> ?WARN("Continuing on after abort: ~p\n", [Rest]), rebar_config:set_xconf(ParentConfig1, @@ -339,7 +339,7 @@ execute(Command, Modules, Config, ModuleFile, Env) -> apply_hooks(post_hooks, NewConfig, Command, Env), NewConfig; {error, failed} -> - ?ABORT; + ?FAIL; {Module, {error, _} = Other} -> ?ABORT("~p failed while processing ~s in module ~s: ~s\n", [Command, Dir, Module, diff --git a/src/rebar_ct.erl b/src/rebar_ct.erl index a875116..d2f45c3 100644 --- a/src/rebar_ct.erl +++ b/src/rebar_ct.erl @@ -83,7 +83,7 @@ clear_log(RawLog) -> ok = file:write_file(RawLog, LogHeader); {error, Reason} -> ?ERROR("Could not create log dir - ~p\n", [Reason]), - ?ABORT + ?FAIL end. %% calling ct with erl does not return non-zero on failure - have to check @@ -98,12 +98,12 @@ check_log(Config, RawLog) -> MakeFailed -> show_log(Config, RawLog), ?ERROR("Building tests failed\n",[]), - ?ABORT; + ?FAIL; RunFailed -> show_log(Config, RawLog), ?ERROR("One or more tests failed\n",[]), - ?ABORT; + ?FAIL; true -> ?CONSOLE("DONE.\n~s\n", [Msg]) @@ -263,7 +263,7 @@ find_suite_path(Suite, TestDir) -> case filelib:is_regular(Path) of false -> ?ERROR("Suite ~s not found\n", [Suite]), - ?ABORT; + ?FAIL; true -> Path end. diff --git a/src/rebar_deps.erl b/src/rebar_deps.erl index da7ad48..67652e3 100644 --- a/src/rebar_deps.erl +++ b/src/rebar_deps.erl @@ -123,7 +123,7 @@ setup_env(Config) -> ?CONSOLE("Dependency not available: " "~p-~s (~p)\n", [App, Vsn, Src]) end, MissingDeps), - ?ABORT + ?FAIL end. 'get-deps'(Config, _) -> diff --git a/src/rebar_erlc_compiler.erl b/src/rebar_erlc_compiler.erl index c6c2d78..f3dd5b6 100644 --- a/src/rebar_erlc_compiler.erl +++ b/src/rebar_erlc_compiler.erl @@ -375,7 +375,7 @@ compile_mib(Source, Target, Config) -> rebar_file_utils:mv(Hrl_filename, "include"), ok; {error, compilation_failed} -> - ?ABORT + ?FAIL end. -spec compile_xrl(Source::file:filename(), Target::file:filename(), diff --git a/src/rebar_erlydtl_compiler.erl b/src/rebar_erlydtl_compiler.erl index 2a9cb63..9c47a63 100644 --- a/src/rebar_erlydtl_compiler.erl +++ b/src/rebar_erlydtl_compiler.erl @@ -120,7 +120,7 @@ compile_dtl(Source, Target, Config) -> " http://code.google.com/p/erlydtl/~n" " and install it into your erlang library dir~n" "===============================================~n~n", []), - ?ABORT; + ?FAIL; _ -> case needs_compile(Source, Target, Config) of true -> @@ -146,7 +146,7 @@ do_compile(Source, Target, Config) -> Reason -> ?ERROR("Compiling template ~s failed:~n ~p~n", [Source, Reason]), - ?ABORT + ?FAIL end. module_name(Target) -> diff --git a/src/rebar_escripter.erl b/src/rebar_escripter.erl index 27e6f0a..e8aa5dc 100644 --- a/src/rebar_escripter.erl +++ b/src/rebar_escripter.erl @@ -74,12 +74,12 @@ escriptize(Config0, AppFile) -> {error, WriteError} -> ?ERROR("Failed to write ~p script: ~p\n", [AppName, WriteError]), - ?ABORT + ?FAIL end; {error, ZipError} -> ?ERROR("Failed to construct ~p escript: ~p\n", [AppName, ZipError]), - ?ABORT + ?FAIL end, %% Finally, update executable perms for our script diff --git a/src/rebar_eunit.erl b/src/rebar_eunit.erl index 5dc99dc..5128dbf 100644 --- a/src/rebar_eunit.erl +++ b/src/rebar_eunit.erl @@ -255,7 +255,7 @@ cover_init(true, BeamFiles) -> [] -> %% No modules compiled successfully...fail ?ERROR("Cover failed to compile any modules; aborting.~n", []), - ?ABORT; + ?FAIL; _ -> %% At least one module compiled successfully diff --git a/src/rebar_file_utils.erl b/src/rebar_file_utils.erl index 51ba96e..d9e295c 100644 --- a/src/rebar_file_utils.erl +++ b/src/rebar_file_utils.erl @@ -108,7 +108,7 @@ delete_each([File | Rest]) -> delete_each(Rest); {error, Reason} -> ?ERROR("Failed to delete file ~s: ~p\n", [File, Reason]), - ?ABORT + ?FAIL end. %% =================================================================== diff --git a/src/rebar_lfe_compiler.erl b/src/rebar_lfe_compiler.erl index d688e9c..4011798 100644 --- a/src/rebar_lfe_compiler.erl +++ b/src/rebar_lfe_compiler.erl @@ -57,7 +57,7 @@ compile_lfe(Source, _Target, Config) -> " {git, \"git://github.com/rvirding/lfe\",~n" " {tag, \"v0.6.1\"}}}~n" "~n", []), - ?ABORT; + ?FAIL; _ -> Opts = [{i, "include"}, {outdir, "ebin"}, return] ++ rebar_config:get_list(Config, erl_opts, []), @@ -67,6 +67,6 @@ compile_lfe(Source, _Target, Config) -> {error, Es, Ws} -> rebar_base_compiler:error_tuple(Source, Es, Ws, Opts); _ -> - ?ABORT + ?FAIL end end. diff --git a/src/rebar_neotoma_compiler.erl b/src/rebar_neotoma_compiler.erl index d0f618f..9bff892 100644 --- a/src/rebar_neotoma_compiler.erl +++ b/src/rebar_neotoma_compiler.erl @@ -80,7 +80,7 @@ compile_neo(Source, Target, Config) -> " https://github.com/seancribbs/neotoma~n" " and install it into your erlang library dir~n" "===============================================~n~n", []), - ?ABORT; + ?FAIL; _ -> case needs_compile(Source, Target, Config) of true -> @@ -104,7 +104,7 @@ do_compile(Source, _Target, Config) -> Reason -> ?ERROR("Compiling peg ~s failed:~n ~p~n", [Source, Reason]), - ?ABORT + ?FAIL end. needs_compile(Source, Target, Config) -> diff --git a/src/rebar_otp_app.erl b/src/rebar_otp_app.erl index 4304600..62befa1 100644 --- a/src/rebar_otp_app.erl +++ b/src/rebar_otp_app.erl @@ -146,12 +146,12 @@ validate_name(AppName, File) -> false -> ?ERROR("Invalid ~s: name of application (~p) " "must match filename.\n", [File, AppName]), - ?ABORT + ?FAIL end. validate_modules(AppName, undefined) -> ?ERROR("Missing modules declaration in ~p.app~n", [AppName]), - ?ABORT; + ?FAIL; validate_modules(AppName, Mods) -> %% Construct two sets -- one for the actual .beam files in ebin/ @@ -169,7 +169,7 @@ validate_modules(AppName, Mods) -> M <- MissingBeams]), ?ERROR("One or more modules listed in ~p.app are not " "present in ebin/*.beam:\n~s", [AppName, Msg1]), - ?ABORT + ?FAIL end, %% Identify .beam files NOT list in the .app, but present in ebin/ @@ -181,7 +181,7 @@ validate_modules(AppName, Mods) -> M <- MissingMods]), ?ERROR("One or more .beam files exist that are not " "listed in ~p.app:\n~s", [AppName, Msg2]), - ?ABORT + ?FAIL end. ebin_modules() -> diff --git a/src/rebar_port_compiler.erl b/src/rebar_port_compiler.erl index b2ff699..38d77e4 100644 --- a/src/rebar_port_compiler.erl +++ b/src/rebar_port_compiler.erl @@ -209,7 +209,7 @@ exec_compiler(Source, Cmd, ShOpts) -> Error = re:replace(RawError, Source, AbsSource, [{return, list}, global]), ?CONSOLE("~s", [Error]), - ?ABORT; + ?FAIL; {ok, Output} -> ?CONSOLE("Compiling ~s\n", [Source]), ?CONSOLE("~s", [Output]) diff --git a/src/rebar_protobuffs_compiler.erl b/src/rebar_protobuffs_compiler.erl index ea34d4f..249588c 100644 --- a/src/rebar_protobuffs_compiler.erl +++ b/src/rebar_protobuffs_compiler.erl @@ -53,7 +53,7 @@ compile(_Config, _AppFile) -> false -> ?ERROR("Protobuffs library not present in code path!\n", []), - ?ABORT + ?FAIL end end. @@ -115,7 +115,7 @@ compile_each([{Proto, Beam, Hrl} | Rest]) -> Other -> ?ERROR("Protobuff compile of ~s failed: ~p\n", [Proto, Other]), - ?ABORT + ?FAIL end; false -> ok diff --git a/src/rebar_reltool.erl b/src/rebar_reltool.erl index c64c785..51fcb0e 100644 --- a/src/rebar_reltool.erl +++ b/src/rebar_reltool.erl @@ -58,10 +58,10 @@ generate(Config0, ReltoolFile) -> ok -> {ok, Config}; {error, failed} -> - ?ABORT; + ?FAIL; Other2 -> ?ERROR("Unexpected error: ~p\n", [Other2]), - ?ABORT + ?FAIL end. overlay(Config, ReltoolFile) -> @@ -238,12 +238,12 @@ mk_target_dir(Config, TargetDir) -> _ -> ?ERROR("Release target directory ~p already exists!\n", [TargetDir]), - ?ABORT + ?FAIL end; {error, Reason} -> ?ERROR("Failed to make target dir ~p: ~s\n", [TargetDir, file:format_error(Reason)]), - ?ABORT + ?FAIL end. diff --git a/src/rebar_xref.erl b/src/rebar_xref.erl index aa595f8..1258079 100644 --- a/src/rebar_xref.erl +++ b/src/rebar_xref.erl @@ -90,7 +90,7 @@ xref(Config, _) -> case lists:member(false, [ExportsNoWarn, UndefNoWarn, QueryNoWarn]) of true -> - ?ABORT; + ?FAIL; false -> ok end.