Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Package riak_cs_control with new node_package features

In addition to packaging changes that brought
riak_cs_control up to par with riak_cs, the general
naming of the installed application changed from
riak_cs_control to riak-cs-control.  This change can
be seen in both rel and package builds.
  • Loading branch information...
commit 5e55aa06415f48bd87f10599934a2ce9058d5936 1 parent 94a514c
@jaredmorrow jaredmorrow authored
View
2  .gitignore
@@ -3,5 +3,5 @@ ebin/
*.dump
priv/log
priv/www/js/generated/*.js
-rel/riak_cs_control
+rel/riak-cs-control
.eunit
View
26 Makefile
@@ -1,8 +1,8 @@
-REPO ?= riak_cs_control
-PKG_NAME ?= riak_cs_control
+REPO ?= riak_cs_control
+
PKG_REVISION ?= $(shell git describe --tags)
-PKG_VERSION ?= $(shell git describe --tags | tr - .)
-PKG_ID = $(PKG_NAME)-$(PKG_VERSION)
+PKG_VERSION ?= $(shell git describe --tags | tr - .)
+PKG_ID = riak-cs-control-$(PKG_VERSION)
PKG_BUILD = 1
BASE_DIR = $(shell pwd)
ERLANG_BIN = $(shell dirname $(shell which erl))
@@ -36,14 +36,14 @@ rel: deps compile
@./rebar generate skip_deps=true $(OVERLAY_VARS)
relclean:
- rm -rf rel/riak_cs_control
+ rm -rf rel/riak-cs-control
##
## Developer targets
##
stage : rel
- $(foreach dep,$(wildcard deps/*), rm -rf rel/riak_cs_control/lib/$(shell basename $(dep))-* && ln -sf $(abspath $(dep)) rel/riak_cs_control/lib;)
- $(foreach app,$(wildcard apps/*), rm -rf rel/riak_cs_control/lib/$(shell basename $(app))-* && ln -sf $(abspath $(app)) rel/riak_cs_control/lib;)
+ $(foreach dep,$(wildcard deps/*), rm -rf rel/riak-cs-control/lib/$(shell basename $(dep))-* && ln -sf $(abspath $(dep)) rel/riak-cs-control/lib;)
+ $(foreach app,$(wildcard apps/*), rm -rf rel/riak-cs-control/lib/$(shell basename $(app))-* && ln -sf $(abspath $(app)) rel/riak-cs-control/lib;)
##
## Doc targets
@@ -53,7 +53,7 @@ docs:
APPS = kernel stdlib sasl erts ssl tools os_mon runtime_tools crypto inets \
xmerl webtool eunit syntax_tools compiler
-PLT = $(HOME)/.riak_cs_control_dialyzer_plt
+PLT = $(HOME)/.riak-cs-control_dialyzer_plt
check_plt: compile
dialyzer --check_plt --plt $(PLT) --apps $(APPS)
@@ -81,17 +81,17 @@ cleanplt:
## Packaging targets
##
.PHONY: package
-export PKG_NAME PKG_VERSION PKG_ID PKG_BUILD BASE_DIR ERLANG_BIN REBAR OVERLAY_VARS RELEASE
+export PKG_VERSION PKG_ID PKG_BUILD BASE_DIR ERLANG_BIN REBAR OVERLAY_VARS RELEASE
package.src: deps
mkdir -p package
rm -rf package/$(PKG_ID)
git archive --format=tar --prefix=$(PKG_ID)/ $(PKG_REVISION)| (cd package && tar -xf -)
make -C package/$(PKG_ID) deps
for dep in package/$(PKG_ID)/deps/*; do \
- echo "Processing dep: $${dep}"; \
- mkdir -p $${dep}/priv; \
- git --git-dir=$${dep}/.git describe --tags >$${dep}/priv/vsn.git; \
- done
+ echo "Processing dep: $${dep}"; \
+ mkdir -p $${dep}/priv; \
+ git --git-dir=$${dep}/.git describe --tags >$${dep}/priv/vsn.git; \
+ done
find package/$(PKG_ID) -depth -name ".git" -exec rm -rf {} \;
tar -C package -czf package/$(PKG_ID).tar.gz $(PKG_ID)
View
24 pkg.vars.config
@@ -0,0 +1,24 @@
+%% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+
+%%
+%% Packaging
+%%
+{package_name, "riak-cs-control"}.
+{package_install_name, "riak-cs-control"}.
+{package_install_user, "riakcs"}.
+{package_install_group, "riak"}.
+{package_install_user_desc, "Riak CS user"}.
+{package_commands, {list, [[{name, "riak-cs-control"}]]}}.
+{package_shortdesc, "Riak Cloud Storage Control"}.
+{package_patch_dir, "basho-patches"}.
+{package_desc, "Riak Cloud Storage Control"}.
+{bin_or_sbin, "bin"}.
+{license_type, "Proprietary"}.
+{copyright, "2013 Basho Technologies, Inc"}.
+{vendor_name, "Basho Technologies, Inc"}.
+{vendor_url, "http://basho.com"}.
+{vendor_contact_name, "Basho Package Maintainer"}.
+{vendor_contact_email, "packaging@basho.com"}.
+{license_full_text, "This software is provided under license from Basho Technologies."}.
+{solaris_pkgname, "BASHOriak-cs-control"}.
View
BIN  rebar
Binary file not shown
View
9 rel/reltool.config
@@ -2,7 +2,7 @@
%% ex: ts=4 sw=4 et
{sys, [
{lib_dirs, ["../deps", "../apps"]},
- {rel, "riak_cs_control", "0.0.1",
+ {rel, "riak-cs-control", "1.0.0",
[
kernel,
stdlib,
@@ -22,7 +22,7 @@
kernel,
stdlib
]},
- {boot_rel, "riak_cs_control"},
+ {boot_rel, "riak-cs-control"},
{profile, embedded},
{excl_sys_filters, ["^bin/.*",
"^erts.*/bin/(dialyzer|typer)"]},
@@ -32,13 +32,14 @@
]}.
-{target_dir, "riak_cs_control"}.
+{target_dir, "riak-cs-control"}.
{overlay_vars, "vars.config"}.
{overlay, [
%% Setup basic dirs that packaging requires
{mkdir, "log"},
+ {mkdir, "data/riak-cs-control"},
%% Copy base files for starting and interacting w/ node
{copy, "../deps/node_package/priv/base/erl",
@@ -46,7 +47,7 @@
{copy, "../deps/node_package/priv/base/nodetool",
"{{erts_vsn}}/bin/nodetool"},
{template, "../deps/node_package/priv/base/runner",
- "sbin/riak_cs_control"},
+ "bin/riak-cs-control"},
{template, "../deps/node_package/priv/base/env.sh",
"lib/env.sh"},
View
8 rel/vars.config
@@ -24,16 +24,20 @@
%%
%% etc/vm.args
%%
-{node, "riak_cs_control@127.0.0.1"}.
+{node, "riak-cs-control@127.0.0.1"}.
{crash_dump, "log/erl_crash.dump"}.
%%
-%% bin/riak_cs_control
+%% bin/riak-cs-control
%%
{data_dir, "{{target_dir}}/data"}.
{runner_script_dir, "$(cd ${0%/*} && pwd)"}.
{runner_base_dir, "{{runner_script_dir}}/.."}.
{runner_etc_dir, "$RUNNER_BASE_DIR/etc"}.
{runner_log_dir, "$RUNNER_BASE_DIR/log"}.
+{runner_lib_dir, "$RUNNER_BASE_DIR/lib"}.
+{runner_patch_dir, "$RUNNER_BASE_DIR/lib/basho-patches"}.
{pipe_dir, "/tmp/$RUNNER_BASE_DIR/"}.
{runner_user, ""}.
+{runner_wait_process, "riak_cs_control_sup"}.
+
Please sign in to comment.
Something went wrong with that request. Please try again.