summaryrefslogtreecommitdiff
path: root/reltool.config
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2017-01-24 09:16:28 +0100
committerLinus Nordberg <linus@nordu.net>2017-02-01 11:24:28 +0100
commitb7b8903b6a7c3342933b9984afa72fb6527b5f72 (patch)
treefc92bfb8b1dccd1dca3f24cba98cf3ea540687bc /reltool.config
parentc0d8aceccb0961a25ee58a163441bbcbe6d6ea3d (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"}]},