diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | rebar.config | 3 | ||||
| -rw-r--r-- | src/rebar.app.src | 2 | ||||
| -rw-r--r-- | src/rebar_prv_escriptize.erl | 6 | ||||
| -rw-r--r-- | src/rebar_prv_shell.erl | 18 |
5 files changed, 17 insertions, 14 deletions
@@ -13,7 +13,7 @@ configuration work. rebar also provides dependency management, enabling application writers to easily re-use common libraries from a variety of locations (git, hg, etc). -3.0 Alpha-5 +3.0 Alpha-6 ==== [DOCUMENTATION](http://www.rebar3.org/v3.0/docs) diff --git a/rebar.config b/rebar.config index f1cbd0a..d68f195 100644 --- a/rebar.config +++ b/rebar.config @@ -18,9 +18,6 @@ {git, "https://github.com/jcomellas/getopt.git", {branch, "master"}}}]}. -{escript_incl_apps, - [getopt, erlware_commons, relx, providers, rebar]}. -{escript_top_level_app, rebar}. {escript_name, rebar3}. {escript_emu_args, "%%! +sbtu +A0\n"}. %% escript_incl_extra is for internal rebar-private use only. diff --git a/src/rebar.app.src b/src/rebar.app.src index f753784..e9f0677 100644 --- a/src/rebar.app.src +++ b/src/rebar.app.src @@ -3,7 +3,7 @@ {application, rebar, [{description, "Rebar: Erlang Build Tool"}, - {vsn, "3.0.0-alpha-5"}, + {vsn, "3.0.0-alpha-6"}, {modules, []}, {registered, []}, {applications, [kernel, diff --git a/src/rebar_prv_escriptize.erl b/src/rebar_prv_escriptize.erl index df3a271..3cdc9bf 100644 --- a/src/rebar_prv_escriptize.erl +++ b/src/rebar_prv_escriptize.erl @@ -90,8 +90,8 @@ escriptize(State0, App) -> %% Look for a list of other applications (dependencies) to include %% in the output file. We then use the .app files for each of these %% to pull in all the .beam files. - InclApps = lists:usort(rebar_state:get(State, escript_incl_apps, []) - ++ all_deps(State)), + InclApps = lists:usort([ec_cnv:to_atom(AppName) | rebar_state:get(State, escript_incl_apps, []) + ++ all_deps(State)]), AllApps = rebar_state:all_deps(State)++rebar_state:project_apps(State), InclBeams = get_apps_beams(InclApps, AllApps), @@ -135,7 +135,7 @@ format_error({bad_name, App}) -> io_lib:format("Failed to get ebin/ directory for " "escript_incl_app: ~p", [App]); format_error(no_main_app) -> - io_lib:format("Multiple project apps and {rebar_escript_plugin, [{main_app, atom()}]}." + io_lib:format("Multiple project apps and {escript_main_app, atom()}." " not set in rebar.config", []). %% =================================================================== diff --git a/src/rebar_prv_shell.erl b/src/rebar_prv_shell.erl index bd49ee1..e407ff2 100644 --- a/src/rebar_prv_shell.erl +++ b/src/rebar_prv_shell.erl @@ -111,12 +111,18 @@ setup_shell() -> %% liveness check. _ = [catch erlang:group_leader(whereis(user), Pid) || Pid <- NeedsUpdate, is_process_alive(Pid)], - %% enable error_logger's tty output - ok = error_logger:swap_handler(tty), - %% disable the simple error_logger (which may have been added multiple - %% times). removes at most the error_logger added by init and the - %% error_logger added by the tty handler - ok = remove_error_handler(3). + try + %% enable error_logger's tty output + error_logger:swap_handler(tty), + %% disable the simple error_logger (which may have been added multiple + %% times). removes at most the error_logger added by init and the + %% error_logger added by the tty handler + remove_error_handler(3) + catch + E:R -> % may fail with custom loggers + ?DEBUG("Logger changes failed for ~p:~p (~p)", [E,R,erlang:get_stacktrace()]), + hope_for_best + end. setup_paths(State) -> %% Add deps to path |