Merge pull request #244 from basho/bs-riaknostic-1.3

Add riaknostic to riak builds

Makefile

@@ -16,6 +16,9 @@ clean: testclean
 distclean: clean devclean relclean ballclean
 	./rebar delete-deps
 
+generate:
+	./rebar generate
+
 
 TEST_LOG_FILE := eunit.log
 testclean:
@@ -36,12 +39,23 @@ test: deps compile testclean
 ##
 ## Release targets
 ##
-rel: deps
-	./rebar compile generate
+rel: deps compile generate riaknostic-rel
 
 relclean:
 	rm -rf rel/riak
 
+##
+## Riaknostic targets
+##
+riaknostic: deps
+	$(MAKE) -C deps/riaknostic -f Makefile
+
+riaknostic-rel: riaknostic
+	rm -rf rel/riak/lib/riaknostic
+	mkdir -p rel/riak/lib/riaknostic
+	cp -f deps/riaknostic/riaknostic rel/riak/lib/riaknostic/
+
+
 ##
 ## Developer targets
 ##
@@ -62,19 +76,21 @@ 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)))
 
-dev% : all
+dev% : all riaknostic
 	mkdir -p dev
 	rel/gen_dev $@ rel/vars/dev_vars.config.src rel/vars/$@_vars.config
 	(cd rel && ../rebar generate target_dir=../dev/$@ overlay_vars=vars/$@_vars.config)
+	mkdir -p dev/$@/lib/riaknostic
+	cp -f deps/riaknostic/riaknostic dev/$@/lib/riaknostic/
 
 stagedev% : dev%
-	  $(foreach dep,$(wildcard deps/*), rm -rf dev/$^/lib/$(shell basename $(dep))-* && ln -sf $(abspath $(dep)) dev/$^/lib;)
+	  $(foreach dep,$(wildcard deps/*), rm -rf dev/$^/lib/$(shell basename $(dep))* && ln -sf $(abspath $(dep)) dev/$^/lib;)
 
 devclean: clean
 	rm -rf dev
 
 stage : rel
-	$(foreach dep,$(wildcard deps/*), rm -rf rel/riak/lib/$(shell basename $(dep))-* && ln -sf $(abspath $(dep)) rel/riak/lib;)
+	$(foreach dep,$(wildcard deps/*), rm -rf rel/riak/lib/$(shell basename $(dep))* && ln -sf $(abspath $(dep)) rel/riak/lib;)
 
 ##
 ## Doc targets
@@ -213,8 +229,7 @@ ballclean:
 
 ##
 ## Packaging targets reside in package directory
-##
-
+#
 # Strip off repo name for packaging
 PKG_VERSION = $(shell echo $(DISTNAME) | sed -e 's/^$(REPO)-//')
 

rebar.config

@@ -13,5 +13,6 @@
        {riak_kv, ".*", {git, "git://github.com/basho/riak_kv", {branch, "master"}}},
        {riak_search, ".*", {git, "git://github.com/basho/riak_search",
                                 {branch, "master"}}},
-       {riak_control, ".*", {git, "git://github.com/basho/riak_control", {branch, "master"}}}
+       {riak_control, ".*", {git, "git://github.com/basho/riak_control", {branch, "master"}}},
+       {riaknostic, ".*", {git, "git://github.com/basho/riaknostic", {branch, "master"}}}
        ]}.