Skip to content

Commit

Permalink
Merge pull request #211 from danikp/master
Browse files Browse the repository at this point in the history
pre-release updates
  • Loading branch information
danikp committed Jan 21, 2015
2 parents 08db9c3 + 814e4b7 commit 0c827cb
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ otp_release:
- R16B03-1
- R16B02
- R16B01

script:
- rebar get-deps
- rebar compile
Expand Down
10 changes: 10 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@

ERL=erl
REBAR=./rebar
GIT = git
REBAR_VER = 2.5.1
DB_CONFIG_DIR=priv/test_db_config

.PHONY: deps get-deps test
Expand All @@ -15,6 +17,14 @@ boss_db:
clean:
@$(REBAR) clean

rebar_src:
@rm -rf $(PWD)/rebar_src
@$(GIT) clone git://github.com/rebar/rebar.git rebar_src
@$(GIT) -C rebar_src checkout tags/$(REBAR_VER)
@cd $(PWD)/rebar_src/; ./bootstrap
@cp $(PWD)/rebar_src/rebar $(PWD)
@rm -rf $(PWD)/rebar_src

get-deps:
@$(REBAR) get-deps

Expand Down
6 changes: 0 additions & 6 deletions build

This file was deleted.

Binary file modified rebar
Binary file not shown.
12 changes: 6 additions & 6 deletions rebar.config
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,24 @@
{parse_transform, import_as}
]}.
{deps, [
{lager, ".*", {git, "git://github.com/basho/lager.git", {tag, "2.0.3"}}},
{lager, ".*", {git, "git://github.com/basho/lager.git", {tag, "2.1.0"}}},
{erlando, ".*", {git, "git://github.com/ChicagoBoss/erlando.git", {tag, "b0b77dd9b9"}}},
{aleppo, ".*", {git, "git://github.com/ChicagoBoss/aleppo.git", {tag, "bef139e4c7"}}},
{aleppo, ".*", {git, "git://github.com/ChicagoBoss/aleppo.git", {tag, "v0.8.14"}}},
{medici, ".*", {git, "git://github.com/ChicagoBoss/medici.git", {tag, "bb6167459d"}}},
{mongodb, ".*", {git, "git://github.com/ChicagoBoss/mongodb-erlang.git", {tag, "ce9bf77902"}}},
{riakc, ".*", {git, "git://github.com/ChicagoBoss/riak-erlang-client.git", {tag, "1.3.0-boss"}}},
{ddb, ".*", {git, "git://github.com/Concurix/ddb.git", {tag, "acad8af654"}}},
{epgsql, ".*", {git, "git://github.com/epgsql/epgsql.git", {tag, "c7dfb064811"}}},
{erlmc, ".*", {git, "git://github.com/bipthelin/erlmc.git", {tag, "3062f8deb7"}}},
{medici, ".*", {git, "git://github.com/ChicagoBoss/medici.git", {tag, "bb6167459d"}}},
{mongodb, ".*", {git, "git://github.com/ChicagoBoss/mongodb-erlang.git", {tag, "ce9bf77902"}}},
{mysql, ".*", {git, "git://github.com/dizzyd/erlang-mysql-driver.git", {tag, "16cae84b5e"}}},
{poolboy, ".*", {git, "git://github.com/devinus/poolboy.git", {tag, "64e1eaef0b"}}},
{riakc, ".*", {git, "git://github.com/ChicagoBoss/riak-erlang-client.git", {tag, "1.3.0-boss"}}},
{tiny_pq, ".*", {git, "git://github.com/ChicagoBoss/tiny_pq.git", {tag, "v0.8.9"}}},
{uuid, ".*", {git, "git://gitorious.org/avtobiff/erlang-uuid.git", {tag, "9cfe9666f1"}}},
{redo, ".*", {git, "git://github.com/JacobVorreuter/redo.git", {tag, "7c7eaef4cd"}}},
% boss_branch for ets_cache
{ets_cache, ".*", {git, "git://github.com/cuongth/ets_cache.git", {tag, "c7a17204cd"}}},
{proper, ".*", {git, "git://github.com/manopapad/proper.git", {tag, "d90fc40579"}}},
{dh_date, ".*", {git, "git://github.com/zotonic/dh_date.git", {tag, "473ad8c473"}}},
{tiny_pq, ".*", {git, "git://github.com/ChicagoBoss/tiny_pq.git", {tag, "v0.8.14"}}},
{boss_test, ".*", {git, "git://github.com/ChicagoBoss/boss_test.git", {tag, "0.0.1"}}}
]}.

Expand Down
2 changes: 1 addition & 1 deletion src/boss_db.app.src
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{application, boss_db,
[
{description, "BossDB: a sharded, caching, evented ORM"},
{vsn, "0.8.13"},
{vsn, "0.8.14"},
{registered, [
boss_cache, boss_cache_sup,
boss_db, boss_db_sup,
Expand Down

0 comments on commit 0c827cb

Please sign in to comment.