浏览代码

Remove hard dependency on proper

Running "make eunit" will now download proper into deps and ensure it
is on the code path. Projects that depend on jiffy will no longer pick
up a transitive dependency on proper.

When the eunit target is run, proper will be cloned into deps/ if not
already found and compiled (also if not already compiled).

Also includes a few Makefile tweaks:

* Add distclean target
* Add .PHONY for Makefile target hygeine
pull/29/head
Seth Falcon 12 年前
父节点
当前提交
3b232315db
共有 2 个文件被更改,包括 13 次插入7 次删除
  1. +13
    -3
      Makefile
  2. +0
    -4
      rebar.config

+ 13
- 3
Makefile 查看文件

@ -8,6 +8,8 @@ clean:
rm -rf .eunit rm -rf .eunit
rm -f test/*.beam rm -f test/*.beam
distclean: clean
rm -rf deps
depends: depends:
@if test ! -d ./deps; then \ @if test ! -d ./deps; then \
@ -25,13 +27,21 @@ etap: test/etap.beam test/util.beam
prove test/*.t prove test/*.t
eunit:
$(REBAR) eunit skip_deps=true
eunit: deps/proper/ebin/proper.beam
ERL_FLAGS='-pa deps/proper/ebin' $(REBAR) eunit skip_deps=true
check: build etap eunit
deps/proper/ebin/proper.beam: deps/proper
cd deps/proper; $(REBAR) compile
deps/proper:
mkdir -p deps
cd deps; git clone git://github.com/manopapad/proper.git
check: build etap eunit
%.beam: %.erl %.beam: %.erl
erlc -o test/ $< erlc -o test/ $<
.PHONY: all clean depends build etap eunit proper check

+ 0
- 4
rebar.config 查看文件

@ -1,7 +1,3 @@
{deps, [
{proper, ".*", {git, "https://github.com/manopapad/proper.git", "master"}}
]}.
{port_specs, [{"priv/jiffy.so", ["c_src/*.c"]}]}. {port_specs, [{"priv/jiffy.so", ["c_src/*.c"]}]}.
{port_env, [ {port_env, [

正在加载...
取消
保存