Skip to content

Commit

Permalink
Update rebar (2.2.0-61-g97751ec)
Browse files Browse the repository at this point in the history
  • Loading branch information
norton committed May 4, 2014
1 parent e881b53 commit d529e11
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 12 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -1,6 +1,7 @@
.eqc-info
.eunit/
.qc/
.rebar/
deps/
ebin/
erl_crash.dump
1 change: 1 addition & 0 deletions .travis.yml
@@ -1,5 +1,6 @@
language: erlang
script: "make clean compile xref test"
otp_release:
- 17.0-rc1
- R16B03-1
- R15B03
12 changes: 3 additions & 9 deletions Makefile
@@ -1,16 +1,16 @@

REBAR?=./rebar

.PHONY: all clean deps compile xref doc test eunit eqc proper triq \
compile-for-eunit compile-for-eqc compile-for-proper compile-for-triq
.PHONY: all clean deps compile xref doc test eunit eqc proper \
compile-for-eunit compile-for-eqc compile-for-proper

all: compile

deps:
$(REBAR) get-deps

clean:
$(REBAR) clean
$(REBAR) clean -r

compile:
$(REBAR) compile
Expand All @@ -34,9 +34,6 @@ eqc: compile-for-eqc
proper: compile-for-proper
@echo "rebar does not implement a 'proper' command" && false

triq: compile-for-triq
$(REBAR) triq skip_deps=true

compile-for-eunit:
$(REBAR) compile eunit compile_only=true

Expand All @@ -45,6 +42,3 @@ compile-for-eqc:

compile-for-proper:
$(REBAR) -D QC -D QC_PROPER compile eqc compile_only=true

compile-for-triq:
$(REBAR) -D QC -D QC_TRIQ compile triq compile_only=true
Binary file modified rebar
Binary file not shown.
8 changes: 5 additions & 3 deletions rebar.config
Expand Up @@ -2,8 +2,10 @@

{require_min_otp_vsn, "R15"}.

{erl_opts, [warnings_as_errors, {platform_define, "R15A", 'old_callbacks'}]}.
{erl_opts, [warnings_as_errors, warn_shadow_vars, warn_obsolete_guard,
{platform_define, "R15A", 'old_callbacks'}]}.

{xref_checks, [undefined_function_calls, deprecated_function_calls]}.
{xref_checks, [undefined_function_calls, undefined_functions,
deprecated_function_calls, deprecated_functions]}.

{deps, [{qc, "", {git, "git://github.com/norton/qc.git"}}]}.
{deps, [{qc, "", {git, "git://github.com/norton/qc.git", {branch, "master"}}}]}.

0 comments on commit d529e11

Please sign in to comment.