diff --git a/.gitignore b/.gitignore index ba3a5b2..fc357b7 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ ebin/ deps/ *.orig /.eunit +_build/ diff --git a/README.markdown b/README.markdown index 1af8114..edda095 100644 --- a/README.markdown +++ b/README.markdown @@ -6,7 +6,7 @@ copyright 2011, 2012 alisdair sullivan jsx is released under the terms of the [MIT][MIT] license -jsx uses [rebar][rebar] for it's build chain +jsx uses [sinan][sinan] or [rebar][rebar] for it's build chain [![Build Status](https://secure.travis-ci.org/talentdeficit/jsx.png?branch=)](http://travis-ci.org/talentdeficit/jsx) @@ -30,18 +30,27 @@ jsx uses [rebar][rebar] for it's build chain ## quickstart ## -to build the library +to build the library + +```bash + tanga:jsx alisdair$ sinan build +``` +or ```bash tanga:jsx alisdair$ rebar compile - ==> jsx (compile) - Compiled src/jsx_verify.erl - Compiled src/jsx_utils.erl - Compiled src/jsx_to_term.erl - Compiled src/jsx_to_json.erl - Compiled src/jsx.erl - Compiled src/jsx_encoder.erl - Compiled src/jsx_decoder.erl +``` + +to run tests + +```bash + tanga:jsx alisdair$ sinan -r tests eunit +``` + +or + +```bash + tanga:jsx alisdair$ rebar eunit ``` to convert a utf8 binary containing a json string into an erlang term @@ -367,5 +376,6 @@ jsx wouldn't be what it is without the contributions of paul davis, lloyd hilaie [yajl]: http://lloyd.github.com/yajl [MIT]: http://www.opensource.org/licenses/mit-license.html [rebar]: https://github.com/basho/rebar +[sinan]: https://github.com/erlware/sinan [meck]: https://github.com/eproxus/meck [rfc4627]: http://tools.ietf.org/html/rfc4627[html4-non-html-data]: http://www.w3.org/TR/html4/appendix/notes.html#h-B.3.2 diff --git a/sinan.config b/sinan.config new file mode 100644 index 0000000..68b26b8 --- /dev/null +++ b/sinan.config @@ -0,0 +1,4 @@ +{project_name, jsx}. +{project_vsn, "1.2.1"}. + +{compile_args, [{release, tests}], [{d, 'TEST'}]}. \ No newline at end of file