diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2015-06-02 11:04:12 -0400 |
|---|---|---|
| committer | Fred Hebert <mononcqc@ferd.ca> | 2015-06-02 11:04:12 -0400 |
| commit | 94742c40ed93bc786f96418eced67a3b257b372d (patch) | |
| tree | 9ac27ae35b6d6d99de54350ad44b179439eea25c | |
| parent | 56fe234db26a314ca0b5c45e79f616136cf511cc (diff) | |
| parent | cf4f079f25768d1029dbdd17d3c6d5f381a3ad9b (diff) | |
Merge pull request #501 from tsloughter/escriptize_improvements
improve escriptize provider
| -rw-r--r-- | rebar.config | 3 | ||||
| -rw-r--r-- | src/rebar_prv_escriptize.erl | 6 |
2 files changed, 3 insertions, 6 deletions
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_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", []). %% =================================================================== |