Browse files

Fixing build and deps

Building can now be made with the makefile as it should.

Tests include PropEr to run, but regular builds do not include
PropEr as it's not needed for production use.
  • Loading branch information...
1 parent e6c6912 commit 72572a17150c42c072cebc57d6d3b99b43ac8bd1 @ferd committed Oct 19, 2012
Showing with 38 additions and 23 deletions.
  1. +3 −3 Makefile
  2. +2 −2 README.markdown
  3. +0 −18 rebar.config
  4. +33 −0 rebar.test.config
View
6 Makefile
@@ -1,3 +1,4 @@
+.PHONY: all test clean
REBAR=./rebar
all:
@@ -10,9 +11,8 @@ edoc:
@$(REBAR) doc
test:
- @rm -rf .eunit
- @mkdir -p .eunit
- @$(REBAR) skip_deps=true eunit
+ @$(REBAR) -C rebar.test.config get-deps compile
+ @$(REBAR) -C rebar.test.config ct skip_deps=true
clean:
@rm -rf deps/ ebin/ logs/
View
4 README.markdown
@@ -17,13 +17,13 @@ Also note that the dispatching of resources is done on a hashing basis and doesn
## How to build ##
- `$ ./rebar compile`
+ `make`
## Running tests ##
Run the small Common Test suite with:
- `$ ./rebar compile && ./rebar ct`
+ `make test`
## How to use dispcount ##
View
18 rebar.config
@@ -13,21 +13,3 @@
%% Erlang compiler options
{erl_first_files, ["dispcount"]}.
{erl_opts, [debug_info, {i, "include"}]}.
-
-%% == Common Test ==
-
-%% Option to pass extra parameters when launching Common Test
-{ct_extra_params, "-boot start_sasl -pa ebin/"}.
-
-%% == Dependencies ==
-
-%% Where to put any downloaded dependencies. Default is "deps"
-{deps_dir, "deps"}.
-
-%% What dependencies we have, dependencies can be of 3 forms, an application
-%% name as an atom, eg. mochiweb, a name and a version (from the .app file), or
-%% an application name, a version and the SCM details on how to fetch it (SCM
-%% type, location and revision). Rebar currently supports git, hg, bzr and svn.
-{deps, [
- {proper, "1.0", {git, "https://github.com/manopapad/proper.git", "master"}}
-]}.
View
33 rebar.test.config
@@ -0,0 +1,33 @@
+%% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 ft=erlang et
+%% This is a sample rebar.conf file that shows examples of some of rebar's
+%% options.
+
+%% == Core ==
+
+%% Additional library directories to add to the code path
+{lib_dirs, []}.
+
+%% == Erlang Compiler ==
+
+%% Erlang compiler options
+{erl_first_files, ["dispcount"]}.
+{erl_opts, [debug_info, {i, "include"}]}.
+
+%% == Common Test ==
+
+%% Option to pass extra parameters when launching Common Test
+{ct_extra_params, "-boot start_sasl -pa ebin/"}.
+
+%% == Dependencies ==
+
+%% Where to put any downloaded dependencies. Default is "deps"
+{deps_dir, "deps"}.
+
+%% What dependencies we have, dependencies can be of 3 forms, an application
+%% name as an atom, eg. mochiweb, a name and a version (from the .app file), or
+%% an application name, a version and the SCM details on how to fetch it (SCM
+%% type, location and revision). Rebar currently supports git, hg, bzr and svn.
+{deps, [
+ {proper, "1.0", {git, "https://github.com/manopapad/proper.git", "master"}}
+]}.

0 comments on commit 72572a1

Please sign in to comment.