Skip to content

Commit cb67886

Browse files
Andrei ZavadaAndrei Zavada
authored andcommitted
osx package
Incidentally, bump riak_kv dep to 3.0.9.2 (does code:load in schema, just for osx)
1 parent d83d0ae commit cb67886

File tree

5 files changed

+25
-2
lines changed

5 files changed

+25
-2
lines changed

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ rel-deb: compile
8686
@$(REBAR) as deb release
8787
@tar --exclude='*/.git/*' -c -C _build/deb/rel riak | tar -x -C rel
8888

89+
rel-osx: compile
90+
@$(REBAR) as osx release
91+
@tar --exclude=vcs -c -C _build/osx/rel riak | tar -x -C rel
92+
8993
relclean:
9094
@rm -rf $(REL_DIR)
9195
@rm -rf rel/riak rel/.libs rel/.deps

rebar.config

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
{deps, [
1212
{lager_syslog, {git, "https://github.com/basho/lager_syslog.git", {tag, "3.1.0"}}},
1313
{cluster_info, {git, "https://github.com/basho/cluster_info.git", {tag, "2.1.0"}}},
14-
{riak_kv, {git, "https://github.com/TI-Tokyo/riak_kv.git", {tag, "riak_kv-3.0.9.1"}}},
14+
{riak_kv, {git, "https://github.com/TI-Tokyo/riak_kv.git", {tag, "riak_kv-3.0.9.2"}}},
1515
{riak_auth_mods, {git, "https://github.com/basho/riak_auth_mods.git", {tag, "riak_kv-3.0.0"}}},
1616
{riaknostic, {git, "https://github.com/basho/riaknostic.git", {tag, "riak_kv-3.0.2"}}},
1717

@@ -177,5 +177,10 @@
177177
{wait_for_process, riak_core_node_watcher}]}
178178
]}
179179
]}
180+
]},
181+
{osx, [
182+
{relx, [
183+
{overlay_vars, "rel/pkg/osx/vars.config"}
184+
]}
180185
]}
181186
]}.

rebar.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
2},
127127
{<<"riak_kv">>,
128128
{git,"https://github.com/TI-Tokyo/riak_kv.git",
129-
{ref,"ce783a18219acf14a9c400522fef7fc0604509a3"}},
129+
{ref,"d242bc57c947040d5014dd0489b666d000192bc0"}},
130130
0},
131131
{<<"riak_pb">>,
132132
{git,"https://github.com/basho/riak_pb.git",

rel/pkg/osx/Makefile

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
BUILDDIR = $(shell pwd)
2+
BUILD_STAGE_DIR = $(BUILDDIR)/riak
3+
PKGNAME = riak-$(PKG_ID)
4+
5+
default: buildrel
6+
mkdir ../packages
7+
tar -czf ../packages/$(PKGNAME).tar.gz -C rel riak && \
8+
(cd ../packages && shasum -a 256 $(PKGNAME).tar.gz > $(PKGNAME).tar.gz.sha)
9+
10+
buildrel:
11+
tar -xf $(BASE_DIR)/rel/pkg/out/$(PKG_ID).tar.gz -C $(BASE_DIR)/rel/pkg/out/$(PKGNAME)
12+
$(MAKE) -C $(BASE_DIR)/rel/pkg/out/$(PKGNAME) rel-osx
13+
chmod 0755 rel/riak/bin/* rel/riak/erts-*/bin/*

rel/pkg/osx/vars.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../vars.config

0 commit comments

Comments
 (0)