Merge master to fortuna #530

Merged
zxq9 merged 52 commits from merge_master_to_fortuna into fortuna 2019-03-05 22:51:14 +09:00
Showing only changes of commit af4f2ad795 - Show all commits

View File

@ -12,7 +12,7 @@
{escript_incl_apps, [aesophia, aebytecode, getopt]}. {escript_incl_apps, [aesophia, aebytecode, getopt]}.
{escript_main_app, aesophia}. {escript_main_app, aesophia}.
{escript_name, aesophia}. {escript_name, aesophia}.
{escript_emu_args, "%%! +sbtu +A0\n"}. {escript_emu_args, "%%! \n"}.
{provider_hooks, [{post, [{compile, escriptize}]}]}. {provider_hooks, [{post, [{compile, escriptize}]}]}.
{post_hooks, [{"(linux|darwin|solaris|freebsd|netbsd|openbsd)", {post_hooks, [{"(linux|darwin|solaris|freebsd|netbsd|openbsd)",
@ -30,8 +30,6 @@
{base_plt_apps, [erts, kernel, stdlib, crypto, mnesia]} {base_plt_apps, [erts, kernel, stdlib, crypto, mnesia]}
]}. ]}.
{relx, [{release, {aesophia, "2.0.0"}, {relx, [{release, {aesophia, "2.0.0"},
[aesophia, aebytecode, getopt]}, [aesophia, aebytecode, getopt]},