Merge pull request #1310 from Quviq/otp20_and_rebar3

Otp20 and rebar3

Author: martinsumner

.gitignore

@@ -1,4 +1,3 @@
-deps
 ebin
 log
 riak_test
@@ -23,4 +22,5 @@ dialyzer_unhandled_warnings
 dialyzer_warnings
 .idea
 riak_test.iml
-
+_build/
+rebar.lock

Makefile

@@ -7,50 +7,34 @@ APPS = kernel stdlib sasl erts ssl tools os_mon runtime_tools crypto inets \
 	observer wx gs
 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"))
-	./rebar get-deps
+	$(REBAR) get-deps
 
 docsclean:
 	@rm -rf doc/*.png doc/*.html doc/*.css edoc-info
 
 compile: deps
-	./rebar compile
+	$(REBAR) compile
 
 clean:
-	@./rebar clean
+	@$(REBAR) clean
 
 distclean: clean
 	@rm -rf riak_test deps
 
 quickbuild:
-	./rebar skip_deps=true compile
-	./rebar escriptize
-
-##
-## Lock Targets
-##
-##  see https://github.com/seth/rebar_lock_deps_plugin
-lock: deps compile
-	./rebar lock-deps
-
-locked-all: locked-deps compile
-
-locked-deps:
-	@echo "Using rebar.config.lock file to fetch dependencies"
-	./rebar -C rebar.config.lock get-deps
+	$(REBAR) compile
+	$(REBAR) escriptize
 
 ##################
 # Dialyzer targets
 ##################
 
-# Legacy target left for compatibility with any existing automation
-# scripts ...
-clean_plt:
-	cleanplt
-
-include tools.mk
+# include tools.mk

intercepts/hashtree_intercepts.erl

@@ -19,7 +19,7 @@
 %%-------------------------------------------------------------------
 
 -module(hashtree_intercepts).
--compile(export_all).
+-compile([export_all, nowarn_export_all]).
 -include("intercept.hrl").
 
 sleep_update_perform(State) ->

intercepts/init_intercepts.erl

@@ -19,7 +19,7 @@
 %%-------------------------------------------------------------------
 
 -module(init_intercepts).
--compile(export_all).
+-compile([export_all, nowarn_export_all]).
 -include("intercept.hrl").
 -define(M, init_orig).
 

intercepts/intercept.erl

@@ -23,7 +23,7 @@
 %% because some of these private functions are useful in their own
 %% right.
 -export([add/3, add/4, clean/1]).
--compile(export_all).
+-compile([export_all, nowarn_export_all]).
 
 -type abstract_code() :: term().
 -type form() :: term().

intercepts/riak_core_broadcast_intercepts.erl

@@ -19,7 +19,7 @@
 %%-------------------------------------------------------------------
 
 -module(riak_core_broadcast_intercepts).
--compile(export_all).
+-compile([export_all, nowarn_export_all]).
 -include("intercept.hrl").
 
 global_send(Msg, Peers) when is_list(Peers) ->

intercepts/riak_core_connection_intercepts.erl

@@ -19,7 +19,7 @@
 %%-------------------------------------------------------------------
 
 -module(riak_core_connection_intercepts).
--compile(export_all).
+-compile([export_all, nowarn_export_all]).
 -include("intercept.hrl").
 
 -define(M, riak_core_connection_orig).

intercepts/riak_core_console_intercepts.erl

@@ -18,7 +18,7 @@
 %
 %% -------------------------------------------------------------------
 -module(riak_core_console_intercepts).
--compile(export_all).
+-compile([export_all, nowarn_export_all]).
 -include("intercept.hrl").
 
 %% See tests/riak_admin_console_tests.erl for more info

intercepts/riak_core_handoff_sender_intercepts.erl

@@ -19,7 +19,7 @@
 %%-------------------------------------------------------------------
 
 -module(riak_core_handoff_sender_intercepts).
--compile(export_all).
+-compile([export_all, nowarn_export_all]).
 -include("intercept.hrl").
 -define(M, riak_core_handoff_sender_orig).
 

intercepts/riak_core_ring_manager_intercepts.erl

@@ -19,7 +19,7 @@
 %%-------------------------------------------------------------------
 
 -module(riak_core_ring_manager_intercepts).
--compile(export_all).
+-compile([export_all, nowarn_export_all]).
 -include("intercept.hrl").
 
 noop_ring_trans(_Fun, _Args) ->