WIP Upgrade to rebar3 3.18, with improvements in packaging and release assembly

Makefile

@@ -4,7 +4,7 @@ PKG_REVISION    ?= $(shell git describe --tags 2>/dev/null)
 PKG_BUILD        = 1
 BASE_DIR         = $(shell pwd)
 ERLANG_BIN       = $(shell dirname $(shell which erl 2>/dev/null) 2>/dev/null)
-OTP_VER          = $(shell echo $(ERLANG_BIN) | rev | cut -d "/" -f 2 | rev)
+OTP_VER          = $(shell erl -eval 'erlang:display(erlang:system_info(otp_release)), halt().' -noshell)
 REBAR           ?= $(BASE_DIR)/rebar3
 OVERLAY_VARS    ?=
 TEST_IGNORE     ?= lager riak basho_bench
@@ -30,12 +30,12 @@ compile:
 
 deps:
 	$(if $(HEAD_REVISION),$(warning "Warning: you have checked out a tag ($(HEAD_REVISION)) and should use the compile target"))
-	$(REBAR) upgrade
+	$(REBAR) upgrade --all
 
 clean: testclean
 	$(REBAR) clean
 
-distclean: clean devclean relclean ballclean
+distclean: clean devclean relclean
 	@rm -rf _build
 
 ##
@@ -74,20 +74,35 @@ test : testclean eunit test-deps
 ## Release targets
 ##
 rel: compile
-	$(REBAR) as rel release
-	cp -a _build/rel/rel/riak rel/
+	@$(REBAR) as rel release
+# freebsd tar won't write to stdout, so:
+	@tar  -c -f rel.tar --exclude '*/.git/*' -C _build/rel/rel riak && tar -x -f rel.tar -C rel && rm rel.tar
 
 rel-rpm: compile
-	$(REBAR) as rpm release
-	cp -a _build/rpm/rel/riak rel/
+	@$(REBAR) as rpm release
+	@tar --exclude-vcs -c -C _build/rpm/rel riak | tar -x -C rel
 
 rel-deb: compile
-	$(REBAR) as deb release
-	cp -a _build/deb/rel/riak rel/
+	@$(REBAR) as deb release
+	@tar --exclude=vcs -c -C _build/deb/rel riak | tar -x -C rel
+
+rel-osx: compile
+	@$(REBAR) as osx release
+	@tar --exclude=vcs -c -C _build/osx/rel riak | tar -x -C rel
+
+# this one is to be called from an external make (not from rel/pkg/Makefile)
+rel-alpine: compile
+	@$(REBAR) as alpine release
+	@(cd _build/alpine/rel/riak/usr/bin && mv riak-nosu riak)
+	@tar --exclude=vcs -c -C _build/alpine/rel riak | tar -x -C rel
+
+rel-fbsdng: compile
+	@$(REBAR) as fbsdng release
+	@tar  -c -f rel.tar --exclude '*/.git/*' -C _build/fbsdng/rel riak && tar -x -f rel.tar -C rel && rm rel.tar
 
 relclean:
-	rm -rf $(REL_DIR)
-	rm -rf rel/riak
+	@rm -rf $(REL_DIR)
+	@rm -rf rel/riak rel/.libs rel/.deps
 
 ##
 ## Developer targets
@@ -231,7 +246,7 @@ PKG_ID := "$(REPO_TAG)-OTP$(OTP_VER)"
 PKG_VERSION = $(shell echo $(PKG_ID) | sed -e 's/^$(REPO)-//')
 
 package:
-	mkdir rel/pkg/out/riak-$(PKG_ID)
+	mkdir -p rel/pkg/out/$(PKG_ID)
 	git archive --format=tar HEAD | gzip >rel/pkg/out/$(PKG_ID).tar.gz
 	$(MAKE) -f rel/pkg/Makefile
 

config/vm.args

@@ -0,0 +1,2 @@
+-setcookie riak
+-name [email protected]

rebar.config

@@ -9,19 +9,19 @@
 {eunit_opts, [nowarn_export_all, verbose]}.
 
 {deps, [
-        {lager_syslog, {git, "https://github.com/basho/lager_syslog.git", {tag, "3.1.0"}}},
-        {cluster_info, {git, "https://github.com/basho/cluster_info.git", {tag, "2.1.0"}}},
-        {riak_kv, {git, "https://github.com/basho/riak_kv.git", {tag, "riak_kv-3.0.9"}}},
-        {riak_auth_mods, {git, "https://github.com/basho/riak_auth_mods.git", {tag, "riak_kv-3.0.0"}}},
-        {riaknostic, {git, "https://github.com/basho/riaknostic.git", {tag, "riak_kv-3.0.2"}}},
+        {lager_syslog, {git, "https://github.com/basho/lager_syslog.git", {branch, "develop-3.0"}}},
+        {cluster_info, {git, "https://github.com/basho/cluster_info.git", {branch, "develop-3.0"}}},
+        {riak_kv, {git, "https://github.com/basho/riak_kv.git", {branch, "develop-3.0"}}},
+        {riak_auth_mods, {git, "https://github.com/basho/riak_auth_mods.git", {branch, "develop-3.0"}}},
+        {riaknostic, {git, "https://github.com/basho/riaknostic.git", {branch, "develop-3.0"}}},
 
         % {yokozuna, {git, "https://github.com/basho/yokozuna.git", {branch, "develop-3.0"}}},
 
-        {riak_repl, {git, "https://github.com/basho/riak_repl.git", {tag, "riak_kv-3.0.9"}}}
+        {riak_repl, {git, "https://github.com/basho/riak_repl", {branch, "develop-3.0"}}}
       ]}.
 
 {project_plugins, [
-    {rebar3_cuttlefish, {git, "https://github.com/basho/rebar3_cuttlefish", {tag, "0.2.0"}}}
+    {rebar3_cuttlefish, {git, "https://github.com/basho/rebar3_cuttlefish", {branch, "develop-3.0"}}}
 ]}.
 
 {cuttlefish, [
@@ -46,7 +46,7 @@
     ]}
 ]}.
 
-{relx, [{release, {riak, "3.0.9"},
+{relx, [{release, {riak, git},
     [kernel,
      stdlib,
      lager,
@@ -82,6 +82,7 @@
     {overlay, [
          {mkdir, "lib/patches"},
          {mkdir, "data/ring"},
+         {mkdir, "log"},
 
          {template, "rel/files/advanced.config", "etc/advanced.config"},
 
@@ -92,90 +93,141 @@
          {template, "rel/files/riak-repl",       "bin/riak-repl"},
          {template, "rel/files/riak",            "usr/bin/riak"},
 
-         {copy, "rel/files/check_ulimit",       "bin/hooks/check_ulimit"},
-         {copy, "rel/files/erl_maxlogsize",     "bin/hooks/erl_maxlogsize"},
-         {copy, "rel/files/erl_codeloadingmode","bin/hooks/erl_codeloadingmode"},
-         {copy, "rel/files/riak_not_running",   "bin/hooks/riak_not_running"},
-         {copy, "rel/files/app_epath.sh",       "lib/app_epath.sh"}
-
+         {copy,     "rel/files/hooks/check_ulimit",       "bin/hooks/check_ulimit"},
+         {copy,     "rel/files/hooks/erl_maxlogsize",     "bin/hooks/erl_maxlogsize"},
+         {copy,     "rel/files/hooks/erl_codeloadingmode","bin/hooks/erl_codeloadingmode"},
+         {template, "rel/files/hooks/riak_not_running",   "bin/hooks/riak_not_running"},
+         {copy,     "rel/files/app_epath.sh",             "lib/app_epath.sh"}
     ]},
 
     {generate_start_script, true},
     {extended_start_script, true},
     {extended_start_script_extensions, [
         {admin, "riak-admin"},
         {repl, "riak-repl"},
+        {debug, "riak-debug"},
         {chkconfig, "riak-chkconfig"}
     ]}
 
 ]}.
 
 {dialyzer, [{plt_apps, all_deps}]}.
 
-{profiles, [
-    {rel, [
-        {relx, [
-            {overlay_vars, "rel/vars.config"},
-            {extended_start_script_hooks,
-                [{pre_start,
-                    [{custom, "hooks/riak_not_running"},
-                    {custom, "hooks/check_ulimit"},
-                    {custom, "hooks/erl_maxlogsize"},
-                    {custom, "hooks/erl_codeloadingmode"}]},
-                {post_start,
-                [{wait_for_process, riak_core_node_watcher}]}
-                ]}
-        ]}
-    ]},
-    {dev, [{relx, [
-            {dev_mode, true},
-            {extended_start_script_hooks,
-                    [{pre_start,
-                        [{custom, "hooks/riak_not_running"},
-                        {custom, "hooks/check_ulimit"},
-                        {custom, "hooks/erl_maxlogsize"},
-                        {custom, "hooks/erl_codeloadingmode"}]},
-                    {post_start,
-                        [{wait_for_process, riak_core_node_watcher}]}
-                    ]}
-        ]}
-    ]},
-    {rpm, [
-        {relx, [
-            {overlay_vars, "rel/pkg/rpm/vars.config"},
-            {overlay, [
-                {template, "rel/files/riak", "usr/sbin/riak"},
-                {template, "rel/pkg/rpm/init.script", "etc/init.d/init.script"}
-            ]},
-            {extended_start_script_hooks,
-                    [{pre_start,
-                        [{custom, "hooks/riak_not_running"},
-                        {custom, "hooks/check_ulimit"},
-                        {custom, "hooks/erl_maxlogsize"},
-                        {custom, "hooks/erl_codeloadingmode"}]},
-                    {post_start,
-                        [{pid, "/var/run/riak/riak.pid"},
-                        {wait_for_process, riak_core_node_watcher}]}
-                    ]}
-        ]}
-    ]},
-    {deb, [
-        {relx, [
-            {overlay_vars, "debian/vars.config"},
-            {overlay, [
-                {template, "rel/files/riak", "usr/bin/riak"}
-            ]},
-            {extended_start_script_hooks,
-                    [{pre_start,
-                        [{custom, "hooks/riak_not_running"},
-                        {custom, "hooks/check_ulimit"},
-                        {custom, "hooks/erl_maxlogsize"},
-                        {custom, "hooks/erl_codeloadingmode"}]},
-                    {post_start,
-                        [wait_for_vm_start,
-                            {pid, "/run/riak/riak.pid"},
-                            {wait_for_process, riak_core_node_watcher}]}
-                    ]}
-        ]}
-    ]}
+{profiles,
+ [{rel,
+   [{relx,
+     [{overlay_vars, "rel/vars.config"},
+      {extended_start_script_hooks,
+       [{pre_start,
+         [{custom, "hooks/riak_not_running"},
+          {custom, "hooks/check_ulimit"},
+          {custom, "hooks/erl_maxlogsize"},
+          {custom, "hooks/erl_codeloadingmode"}]},
+        {post_start,
+         [{wait_for_process, riak_core_node_watcher}
+         ]}
+       ]}
+     ]}
+   ]},
+
+  {dev,
+   [{relx,
+     [{dev_mode, true},
+      {extended_start_script_hooks,
+       [{pre_start,
+         [{custom, "hooks/riak_not_running"},
+          {custom, "hooks/check_ulimit"},
+          {custom, "hooks/erl_maxlogsize"},
+          {custom, "hooks/erl_codeloadingmode"}
+         ]},
+        {post_start,
+         [{wait_for_process, riak_core_node_watcher}]}
+       ]}
+     ]}
+   ]},
+
+  {rpm,
+   [{relx,
+     [{overlay_vars, "rel/pkg/rpm/vars.config"},
+      {overlay,
+       [{template, "rel/files/riak", "usr/sbin/riak"},
+        {template, "rel/pkg/rpm/init.script", "etc/init.d/init.script"}
+       ]},
+      {extended_start_script_hooks,
+       [{pre_start,
+         [{custom, "hooks/riak_not_running"},
+          {custom, "hooks/check_ulimit"},
+          {custom, "hooks/erl_maxlogsize"},
+          {custom, "hooks/erl_codeloadingmode"}
+         ]},
+        {post_start,
+         [{pid, "/var/run/riak/riak.pid"},
+          {wait_for_process, riak_core_node_watcher}]}
+       ]}
+     ]}
+   ]},
+
+  {deb,
+   [{relx,
+     [{overlay_vars, "rel/pkg/deb/vars.config"},
+      {overlay,
+       [{template, "rel/files/riak", "usr/bin/riak"}
+       ]},
+      {extended_start_script_hooks,
+       [{pre_start,
+         [{custom, "hooks/riak_not_running"},
+          {custom, "hooks/check_ulimit"},
+          {custom, "hooks/erl_maxlogsize"},
+          {custom, "hooks/erl_codeloadingmode"}
+         ]},
+        {post_start,
+         [wait_for_vm_start,
+          {pid, "/run/riak/riak.pid"},
+          {wait_for_process, riak_core_node_watcher}]}
+       ]}
+     ]}
+   ]},
+
+  {alpine,
+   [{relx,
+     [{overlay_vars, "rel/pkg/alpine/vars.config"},
+      {overlay,
+       [{template, "rel/pkg/alpine/riak-nosu", "usr/bin/riak-nosu"}  %% to be renamed to riak in Makefile
+       ]},
+      {extended_start_script_hooks,
+       [{pre_start,
+         [{custom, "hooks/riak_not_running"},
+          {custom, "hooks/check_ulimit"},
+          {custom, "hooks/erl_maxlogsize"},
+          {custom, "hooks/erl_codeloadingmode"}]},
+        {post_start,
+         [wait_for_vm_start,
+          {pid, "/run/riak/riak.pid"},
+          {wait_for_process, riak_core_node_watcher}]}
+       ]}
+     ]}
+   ]},
+
+  {osx,
+   [{relx,
+     [{overlay_vars, "rel/pkg/osx/vars.config"}
+     ]}
+   ]},
+
+  {fbsdng,
+   [{relx,
+     [{overlay_vars, "rel/pkg/fbsdng/vars.config"},
+      {extended_start_script_hooks,
+       [{pre_start,
+         [{custom, "hooks/riak_not_running"},
+          {custom, "hooks/check_ulimit"},
+          {custom, "hooks/erl_maxlogsize"},
+          {custom, "hooks/erl_codeloadingmode"}]},
+        {post_start,
+         [wait_for_vm_start,
+          {pid, "/var/run/riak/riak.pid"},
+          {wait_for_process, riak_core_node_watcher}]}
+       ]}
+     ]}
+   ]}
 ]}.