THRIFT-4583: Switch to rebar3
Client: erl
diff --git a/lib/erl/Makefile.am b/lib/erl/Makefile.am
index fdfc9eb..d4544a3 100644
--- a/lib/erl/Makefile.am
+++ b/lib/erl/Makefile.am
@@ -49,13 +49,10 @@
touch .generated
all: .generated
- $(REBAR) get-deps
$(REBAR) compile
check: .generated
- $(REBAR) -C rebar.test.config get-deps
- $(REBAR) -C rebar.test.config compile
- $(REBAR) -C rebar.test.config skip_deps=true eunit
+ $(REBAR) eunit
install: all
mkdir -p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift) ; \
@@ -73,7 +70,7 @@
$(REBAR) clean
$(RM) .generated
$(RM) -r .rebar/
- $(RM) -r deps/
+ $(RM) -r _build/
$(RM) -r test/gen-erl/
$(RM) $(THRIFT_OMIT_FILE)
@@ -83,7 +80,7 @@
dist-hook:
$(RM) $(distdir)/.generated
$(RM) -r $(distdir)/.rebar/
- $(RM) -r $(distdir)/deps/
+ $(RM) -r $(distdir)/_build/
$(RM) -r $(distdir)/ebin/
$(RM) -r $(distdir)/test/gen-erl/
$(RM) $(distdir)/$(THRIFT_OMIT_FILE)
@@ -94,7 +91,6 @@
coding_standards.md \
rebar.config \
rebar.config.script \
- rebar.test.config \
test \
README.md
diff --git a/lib/erl/rebar.config b/lib/erl/rebar.config
index 1ea18a4..1b32947 100644
--- a/lib/erl/rebar.config
+++ b/lib/erl/rebar.config
@@ -1 +1,3 @@
{erl_opts, [{platform_define, "^R.*", otp16_or_less}, debug_info]}.
+
+{profiles, [{test, [{deps, [meck]}]}]}.
diff --git a/lib/erl/rebar.test.config b/lib/erl/rebar.test.config
deleted file mode 100644
index 2ff2afb..0000000
--- a/lib/erl/rebar.test.config
+++ /dev/null
@@ -1,5 +0,0 @@
-{erl_opts, [{platform_define, "^R.*", otp16_or_less}, debug_info]}.
-
-{deps, [
- {meck, "", {git, "https://github.com/eproxus/meck.git", {tag, "0.8.9"}}}
-]}.