diff --git a/.travis.yml b/.travis.yml index 50d1401..3f05122 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: erlang -script: make test +script: rebar skip_deps=true eunit otp_release: - R15B - R14B02 diff --git a/README.markdown b/README.markdown index 99cf020..473882f 100644 --- a/README.markdown +++ b/README.markdown @@ -1,4 +1,4 @@ -## jsx (v1.0rc) ## +## jsx (v1.0.1) ## a sane json implementation for erlang, inspired by [yajl][yajl] @@ -6,7 +6,7 @@ copyright 2011, 2012 alisdair sullivan jsx is released under the terms of the [MIT][MIT] license -to build jsx, use `make`. to run the test suite, use `make test` +jsx uses [rebar][rebar] and [meck][meck] [![Build Status](https://secure.travis-ci.org/talentdeficit/jsx.png?branch=master)](http://travis-ci.org/talentdeficit/jsx) @@ -196,5 +196,7 @@ paul davis, lloyd hilaiel, john engelhart, bob ippolito, fernando benavides and [yajl]: http://lloyd.github.com/yajl [MIT]: http://www.opensource.org/licenses/mit-license.html +[rebar]: https://github.com/basho/rebar +[meck]: https://github.com/eproxus/meck [json]: http://json.org [rfc4627]: http://tools.ietf.org/html/rfc4627 \ No newline at end of file diff --git a/makefile b/makefile deleted file mode 100644 index e119844..0000000 --- a/makefile +++ /dev/null @@ -1,20 +0,0 @@ -compile: get-deps - ./rebar compile - -compile-test: get-test-deps - ./rebar --config rebar.test.config compile - -clean: - ./rebar clean - -clean-test: - ./rebar --config rebar.test.config clean - -get-deps: - ./rebar recursive=true get-deps - -get-test-deps: - ./rebar --config rebar.test.config get-deps - -test: clean-test compile-test - ./rebar --config rebar.test.config skip_deps=true eunit \ No newline at end of file diff --git a/rebar b/rebar deleted file mode 100755 index 5a93f05..0000000 Binary files a/rebar and /dev/null differ diff --git a/rebar.test.config b/rebar.test.config deleted file mode 100644 index cc675f8..0000000 --- a/rebar.test.config +++ /dev/null @@ -1,32 +0,0 @@ -%% uncomment to get verbose output from test suite -%% {eunit_opts, [verbose]}. - -{erl_opts, [ - {i, "src"}, - {src_dirs, ["src"]}, - warn_unused_vars, - warn_export_all, - warn_shadow_vars, - warn_unused_import, - warn_unused_function, - warn_bif_clash, - warn_unused_record, - warn_deprecated_function, - warn_obsolete_guard, - strict_validation, - warn_export_vars, - warn_exported_vars -]}. - -{dialyzer_opts, [{warnings, [ - unmatched_returns, - error_handling, - race_conditions, - behaviours -]}]}. - -{xref_checks, [undefined_function_calls]}. - -{cover_enabled, true}. - -{deps, [{'meck', ".*", {git, "git://github.com/eproxus/meck.git"}}]}. \ No newline at end of file