From 663b62c90c9ff91a81d31e10c0dc545fb5da76ef Mon Sep 17 00:00:00 2001 From: alisdair sullivan Date: Fri, 29 Mar 2013 19:06:19 -0700 Subject: [PATCH] simplify build process and configuration remove largely irrelevent rebar config and provide alternate build config for hipe compiler. update README to reflect changes --- README.markdown | 15 +++++++-------- hipe.cfg | 2 ++ rebar.config | 29 ----------------------------- sinan.config | 4 ---- 4 files changed, 9 insertions(+), 41 deletions(-) create mode 100644 hipe.cfg delete mode 100644 rebar.config delete mode 100644 sinan.config diff --git a/README.markdown b/README.markdown index 5766efd..0411cba 100644 --- a/README.markdown +++ b/README.markdown @@ -7,7 +7,7 @@ copyright 2010-2013 alisdair sullivan jsx is released under the terms of the [MIT][MIT] license -jsx may be built using either [sinan][sinan] or [rebar][rebar] +jsx is built via [rebar][rebar] @@ -42,15 +42,15 @@ jsx may be built using either [sinan][sinan] or [rebar][rebar] #### to build the library and run tests #### -```bash -$ sinan build -$ sinan -r tests eunit -``` -or ```bash $ rebar compile $ rebar eunit ``` +or, to build using hipe +```bash +$ rebar -C hipe.cfg compile +$ rebar -C hipe.cfg eunit +``` #### to convert a utf8 binary containing a json string into an erlang term #### @@ -706,7 +706,6 @@ jsx wouldn't be what it is without the contributions of [paul davis](https://git [json]: http://json.org [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 +[rebar]: https://github.com/rebar/rebar [meck]: https://github.com/eproxus/meck [rfc4627]: http://tools.ietf.org/html/rfc4627 diff --git a/hipe.cfg b/hipe.cfg new file mode 100644 index 0000000..1dee2a4 --- /dev/null +++ b/hipe.cfg @@ -0,0 +1,2 @@ +%% compile using hipe +{erl_opts, [native]}. \ No newline at end of file diff --git a/rebar.config b/rebar.config deleted file mode 100644 index 853f732..0000000 --- a/rebar.config +++ /dev/null @@ -1,29 +0,0 @@ -%% uncomment to get verbose output from test suite -%% {eunit_opts, [verbose]}. - -{erl_opts, [ - {i, "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}. diff --git a/sinan.config b/sinan.config deleted file mode 100644 index 68b26b8..0000000 --- a/sinan.config +++ /dev/null @@ -1,4 +0,0 @@ -{project_name, jsx}. -{project_vsn, "1.2.1"}. - -{compile_args, [{release, tests}], [{d, 'TEST'}]}. \ No newline at end of file