Change devrel generation by handling overlay_vars in separate profile

for dev. Also fixed --output-dir by modifying rebar3_cuttlefish plugin
to correctly generate default conf with custom reldir path.

Author: Martin Cox

Makefile

@@ -100,17 +100,9 @@ SEQ = $(shell awk 'BEGIN { for (i = 1; i < '$(DEVNODES)'; i++) printf("%i ", i);
 $(eval stagedevrel : $(foreach n,$(SEQ),stagedev$(n)))
 $(eval devrel : $(foreach n,$(SEQ),dev$(n)))
 
-## need absolute path for overlay_vars due to rebar3 bug
-## We want to use ./rebar3 release --overlay_vars rel/vars/$@_vars.config
-## but somehow that seems not to work
 dev% : all
-	mkdir -p dev
-	cp rel/vars.config rel/vars.config.backup
 	rel/gen_dev $@ rel/vars/dev_vars.config.src rel/vars/$@_vars.config
-	cp rel/vars/$@_vars.config rel/vars.config
-	$(REBAR) release
-	cp -r _build/default/rel/riak/ dev/$@/
-	mv rel/vars.config.backup rel/vars.config
+	$(REBAR) as dev release -o dev/$@ --overlay_vars rel/vars/$@_vars.config
 
 perfdev : all
 	perfdev/bin/riak stop || :

rebar.config

@@ -72,8 +72,6 @@
     {dev_mode, false},
     {include_erts, true},
 
-    {overlay_vars, "rel/vars.config"},
-
     {overlay, [
          {mkdir, "lib/basho-patches"},
 
@@ -112,6 +110,11 @@
 ]}.
 
 {profiles, [
+    {prod, [
+        {relx, [
+            {overlay_vars, "rel/vars.config"}
+        ]}
+    ]},
     {dev, [
         {relx, [
             {dev_mode, true}