summaryrefslogtreecommitdiff
path: root/reltool.config
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2017-01-27 16:35:21 +0100
committerLinus Nordberg <linus@nordu.net>2017-01-30 09:54:08 +0100
commit2e54755b9afacdb2d001b7ad4a81a8a23b6f43e0 (patch)
treeb258faa94aaf6115dda8dc5117c443b2d5e8d6df /reltool.config
parent6df4a9012f03af16779ae4172831367881b4090b (diff)
Parallelised merge, distribution phase.
Diffstat (limited to 'reltool.config')
-rw-r--r--reltool.config6
1 files changed, 4 insertions, 2 deletions
diff --git a/reltool.config b/reltool.config
index b00f48b..5f837d1 100644
--- a/reltool.config
+++ b/reltool.config
@@ -3,13 +3,15 @@
{erts, [{mod_cond, derived}, {app_file, strip}]},
{app_file, strip},
{rel, "catlfish", "0.10.0-dev", [kernel, stdlib, sasl, catlfish]},
+ {rel, "merge", "0.10.0-dev", [sasl, merge]},
{boot_rel, "catlfish"},
{profile, standalone},
{incl_sys_filters, ["^bin/", "^erts-.*/", "^lib"]},
- {incl_app_filters, ["^ebin/", "^priv/", "^src/"]},
- {app, catlfish, [{app_file, all}, {lib_dir, "."}]},
+ {incl_app_filters, ["ebin/", "priv/", "src/"]},
{escript, "./verifycert.erl", [{incl_cond, include}]},
+ {app, catlfish, [{app_file, all}, {lib_dir, "."}]},
{app, plop, [{app_file, all}, {lib_dir, "../plop"}]},
+ {app, merge, [{app_file, all}, {lib_dir, "../plop/merge"}]},
{app, mochiweb, [{app_file, all}, {lib_dir, "../mochiweb"}]},
{app, idna, [{app_file, all}, {lib_dir, "../hackney/deps/idna"}]},
{app, hackney, [{app_file, all}, {lib_dir, "../hackney"}]},