Permalink
Browse files

Switched to erlang.mk

  • Loading branch information...
1 parent 00064ac commit 114e393f699210864e9ca22fdada3faccd69362e @lehoff committed Sep 20, 2013
Showing with 50 additions and 33 deletions.
  1. +10 −2 .gitignore
  2. +6 −0 CHANGELOG.md
  3. +10 −6 INSTALL.md
  4. +14 −18 Makefile
  5. +0 −6 rebar.config
  6. +7 −0 src/chronos.app.src
  7. +3 −1 test/chronos_SUITE.erl
View
12 .gitignore
@@ -1,2 +1,10 @@
-_build/*
-*.beam
+*.beam
+logs/*
+ct_run.ct*
+deps/*
+ebin/*
+all_runs.html
+index.html
+*.js
+variables-ct*
+ct_default.css
View
6 CHANGELOG.md
@@ -1,5 +1,11 @@
# Change log for Chronos
+## v0.0.5
+
+* Use erlang.mk instead of rebar.
+* added cleaning of CT artefacts.
+
+
## v0.0.4
* rebarified Chronos.
View
16 INSTALL.md
@@ -4,18 +4,22 @@ Chronos depends on gproc and has been tested with 0.2.12 as well as the latest m
So you have to install gproc-0.2.12 in a place where your Erlang can find it.
-The dependency is documented in the `sinan.config` file.
-## Using sinan
+## Using erlang.mk
-It should work - I use sinan myself and it works for me.
+Just add
+dep_chronos = https://github.com/lehoff/chronos v0.0.5
+to your Makefile and it should be fine.
## Using rebar
If you are using rebar to build your project you should add the following to your dependencies:
- {chronos, "0.0.3", {git, "git://github.com/lehoff/chronos.git", {tag, "v0.0.3"}}},
- {gproc, "0.2.12", {git, "https://github.com/uwiger/gproc.git", {tag,"v0.2.10"}}}
+ {chronos, "0.0.3", {git, "git://github.com/lehoff/chronos.git", {tag, "v0.0.3"}}}
+
+Chronos uses gproc and should you run into trouble with the `gproc`
+dependecy Chronos will probably just work with the lastest version of
+gproc, if not, please let me know and I will look into it.
+
-Should you run into trouble with the `gproc` dependecy Chronos will probably just work with the lastest version of gproc, if not, please let me know and I will look into it.
View
32 Makefile
@@ -11,36 +11,32 @@ TEST_DEPS = meck
dep_meck = git://github.com/eproxus/meck 0.7.2
-include erlang.mk
-
-
-.PHONY: build get-deps update-deps test clean deep-clean
+CT_SUITES = chronos
-REBAR = rebar
-
-#build:
-# @$(REBAR) compile
+include erlang.mk
-test: build
- @$(REBAR) ct skip_deps=true
+test_chronos: ERLC_OPTS := $(filter-out -Werror,$(ERLC_OPTS))
example_beams: examples/*.erl
examples: build example_beams
erlc -o examples examples/*.erl
-ex_shell: examples
+ex-shell: examples
erl -pz examples -pz deps/*/ebin -pz ebin
-clean_beam:
+clean-beam:
rm -rf ebin/*.beam examples/*.beam test/*.beam
-deep-clean: clean
- @$(REBAR) delete-deps
-get-deps:
- @$(REBAR) get-deps
+clean-ct:
+ rm -rf ct_run*
+ -rm -f all_runs.html
+ -rm -f index.html
+ -rm -f jquery*.js
+ -rm -f ct_default.css
+ -rm -f variables-ct*
-update-deps:
- @$(REBAR) update-deps
+deep-clean: clean-beam clean-ct
+ rm -rf deps
View
6 rebar.config
@@ -1,6 +0,0 @@
-{deps, [
- {gproc, ".*", {git, "git://github.com/uwiger/gproc",
- {tag, "0.2.13.3"}}},
- {meck, ".*", {git, "git://github.com/eproxus/meck",
- {tag, "0.7.2"}}}
- ]}.
View
7 src/chronos.app.src
@@ -0,0 +1,7 @@
+{application,chronos,
+ [{description,"chronos - a timer utility for Erlang"},
+ {vsn,"0.0.5"},
+ {modules,[chronos]},
+ {registered,[]},
+ {applications,[kernel,stdlib,gproc]},
+ {start_phases,[]}]}.
View
4 test/chronos_SUITE.erl
@@ -1,5 +1,7 @@
-module(chronos_SUITE).
--compile(export_all).
+
+-export([all/0,
+ chronos_eqc/1]).
all() ->
[chronos_eqc].

0 comments on commit 114e393

Please sign in to comment.