Upgrade meck, and fix makefile

Author: hanssv

Makefile

@@ -10,8 +10,8 @@ PLT = $(HOME)/.riak-test_dialyzer_plt
 REBAR=./rebar3
 
 all: deps compile
-	$(REBAR) skip_deps=true escriptize
-	SMOKE_TEST=1 $(REBAR) skip_deps=true escriptize
+	$(REBAR) escriptize
+	SMOKE_TEST=1 $(REBAR) escriptize
 
 deps:
 	$(if $(HEAD_REVISION),$(warning "Warning: you have checked out a tag ($(HEAD_REVISION)) and should use the locked-deps target"))
@@ -30,11 +30,11 @@ distclean: clean
 	@rm -rf riak_test deps
 
 quickbuild:
-	$(REBAR) skip_deps=true compile
+	$(REBAR) compile
 	$(REBAR) escriptize
 
 ##################
 # Dialyzer targets
 ##################
 
-include tools.mk
+# include tools.mk

rebar.config

@@ -14,18 +14,27 @@
         gen_fsm_compat,
         {lager, ".*", {git, "git://github.com/basho/lager", {tag, "3.2.1"}}},
         {getopt, ".*", {git, "git://github.com/jcomellas/getopt", {tag, "v0.4"}}},
-        {meck, "0.8.2", {git, "git://github.com/basho/meck.git", {tag, "0.8.2"}}},
+        {meck, {git, "git://github.com/eproxus/meck.git", {tag, "0.8.13"}}},
         {mapred_verify, ".*", {git, "git://github.com/basho/mapred_verify", {branch, "master"}}},
         {riakc, ".*", {git, "git://github.com/basho/riak-erlang-client", {branch, "develop-3.0"}}},
         {riakhttpc, ".*", {git, "git://github.com/basho/riak-erlang-http-client", {branch, "develop-3.0"}}},
         {kvc, "1.7.0", {git, "https://github.com/etrepum/kvc", {tag, "v1.7.0"}}},
         {druuid, ".*", {git, "git://github.com/kellymclaughlin/druuid.git", {tag, "0.2"}}},
-        {rebar_lock_deps_plugin, ".*", {git, "https://github.com/basho/rebar_lock_deps_plugin.git", {tag, "3.1.0p1"}}},
         {kv_index_tictactree, ".*", {git, "https://github.com/martinsumner/kv_index_tictactree.git", {branch, "master"}}}
        ]}.
 
 {escript_incl_apps, [goldrush, lager, getopt, riakhttpc, riakc, ibrowse, mochiweb, kvc, kv_index_tictactree]}.
 {escript_emu_args, "%%! -escript main riak_test_escript +K true +P 10000 -env ERL_MAX_PORTS 10000\n"}.
+
+{post_hooks, [{"(linux|darwin|solaris|freebsd|netbsd|openbsd)",
+               escriptize,
+               "cp \"$REBAR_BUILD_DIR/bin/riak_test\" ./riak_test"},
+              {"win32",
+               escriptize,
+               "robocopy \"%REBAR_BUILD_DIR%/bin/\" ./ riak_test* "
+               "/njs /njh /nfl /ndl & exit /b 0"} % silence things
+             ]}.
+
 %% {plugin_dir, "src"}.
 %% {plugins, [rebar_riak_test_plugin]}.
 %% {riak_test, [