Skip to content

Commit

Permalink
Switch fully to rebar3 + update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
uwiger authored and tolbrino committed Oct 26, 2018
1 parent fde11e4 commit 6b8cd6c
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 90 deletions.
5 changes: 0 additions & 5 deletions .travis.yml
Expand Up @@ -9,10 +9,5 @@ otp_release:
- 19.3
- 19.2
- 19.1
- 19.0
- 18.3
- 18.2.1
- 18.2
- 18.1
- 18.0
after_failure: "echo 'logs/raw.log\n'; cat logs/raw.log; for f in `find logs/ct_run*/log*/ -type f`; do echo \"\n$f\n\" ; cat $f; done"
36 changes: 16 additions & 20 deletions Makefile
@@ -1,48 +1,44 @@
.PHONY: all clean clean_plt deps compile test doc dialyzer xref ci
REBAR3=$(shell which rebar3 || echo ./rebar3)

.PHONY: all clean clean_plt compile test doc dialyzer xref ci

EXOMETER_PLT=exometer_core.plt
DIALYZER_OPTS = # -Wunderspecs
DIALYZER_APPS = erts kernel stdlib compiler syntax_tools \
test_server common_test folsom \
parse_trans setup

all: deps compile xref test

ci: deps compile xref dialyzer test
all: compile xref test

deps:
rebar3 upgrade
ci: compile xref dialyzer test

compile:
rebar3 compile
$(REBAR3) compile

clean: clean_plt
rebar3 clean
$(REBAR3) clean

clean-all: clean
rm -rf deps

rm -rf _build
test:
ERL_LIBS=./examples rebar3 ct skip_deps=true
$(REBAR3) as test do eunit
$(REBAR3) as test do ct

xref:
ERL_LIBS=./deps rebar3 xref skip_deps=true

edown_deps:
rebar3 as docs upgrade
rebar3 as docs compile
$(REBAR3) xref

doc: edown_deps
rebar3 as docs edoc
doc:
$(REBAR3) as docs do edoc

$(EXOMETER_PLT): deps compile
$(EXOMETER_PLT):
$(REBAR3) compile
ERL_LIBS=deps dialyzer --build_plt --output_plt $(EXOMETER_PLT) \
--apps $(DIALYZER_APPS) | \
fgrep -v -f ./dialyzer.ignore-warnings

clean_plt:
rm -f $(EXOMETER_PLT)

dialyzer: deps compile $(EXOMETER_PLT)
dialyzer: compile $(EXOMETER_PLT)
dialyzer -r ebin --plt $(EXOMETER_PLT) $(DIALYZER_OPTS) | \
fgrep -v -f ./dialyzer.ignore-warnings
35 changes: 0 additions & 35 deletions priv/check_edown.script

This file was deleted.

18 changes: 0 additions & 18 deletions priv/remove_deps.script

This file was deleted.

4 changes: 2 additions & 2 deletions rebar.config
Expand Up @@ -17,8 +17,8 @@

{profiles,
[
{test, [{deps, [{meck, "0.8.4"}]}]},
{docs, [{deps, [{edown, {git, "git://github.com/uwiger/edown.git", {branch, "master"}}}]}]}
{test, [{deps, [{meck, "0.8.9"}]}]},
{docs, [{deps, [{edown, "0.8.1"}]}]}
]}.

{erl_opts,
Expand Down
9 changes: 3 additions & 6 deletions rebar.config.script
Expand Up @@ -35,13 +35,10 @@ CFG1 = case os:getenv("REBAR_DEPS") of
lists:keystore(deps_dir, 1, CONFIG0, {deps_dir, Dir})
end.

Priv = filename:join(filename:dirname(SCRIPT), "priv").
CFG2 = Script(Priv, "check_edown.script", [{'CONFIG', CFG1}]).

case os:getenv("EXOMETER_CORE_CONFIG_POSTPROCESS") of
false -> CFG2;
[] -> CFG2;
false -> CFG1;
[] -> CFG1;
PoPScr -> Script(filename:dirname(PoPScr),
filename:basename(PoPScr),
[{'CONFIG', CFG2}])
[{'CONFIG', CFG1}])
end.
4 changes: 0 additions & 4 deletions rebar.lock
@@ -1,9 +1,5 @@
{"1.1.0",
[{<<"bear">>,{pkg,<<"bear">>,<<"0.8.5">>},1},
{<<"edown">>,
{git,"git://github.com/esl/edown.git",
{ref,"4d18dc4bec89c20c0ba8cab6884ce690ca606f4a"}},
0},
{<<"folsom">>,{pkg,<<"folsom">>,<<"0.8.5">>},0},
{<<"hut">>,{pkg,<<"hut">>,<<"1.2.0">>},0},
{<<"parse_trans">>,{pkg,<<"parse_trans">>,<<"3.2.0">>},0},
Expand Down
Binary file added rebar3
Binary file not shown.

0 comments on commit 6b8cd6c

Please sign in to comment.