This is an automated email from the ASF dual-hosted git repository. ronny pushed a commit to branch update-snappy in repository https://gitbox.apache.org/repos/asf/couchdb-snappy.git
commit 717918fe4c2951fe34fe19feccdf3b472369cf1d Author: Dave Cottlehuber <[email protected]> AuthorDate: Wed Dec 2 12:25:46 2020 +0000 switch to rebar3 and enc Our rebar is so old it fails on OTP23. Use rebar3 & davisp/enc instead. --- .gitignore | 3 +++ Makefile | 6 +++--- README.md | 10 ++++++++++ enc | Bin 0 -> 26232 bytes rebar | Bin 118744 -> 0 bytes rebar.config | 18 ++++++------------ rebar3 | Bin 0 -> 958634 bytes 7 files changed, 22 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 1e46bde..17d172f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,6 @@ priv *~ *.swp _build +c_src/snappy/*.d +c_src/*.d +compile_commands.json diff --git a/Makefile b/Makefile index 4d49b32..9be4a26 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,14 @@ all: snappy eunit snappy: - ./rebar compile + ./rebar3 compile eunit: - ./rebar eunit + ./rebar3 eunit check: eunit clean: - ./rebar clean + ./rebar3 clean rm -fr priv ebin diff --git a/README.md b/README.md index c1656f8..5d2ac33 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,15 @@ Google snappy's official repository and bug tracking system is at: Its source is included in this project. +# changelog + +- switch build chain to [rebar3] and [enc] requiring OTP20 or newer +- tag `snappy-1.1.8`, also first version compatible with OTP23 (thanks @skaes) +- tag `snappy-1.1.3` +- add a changelog + +[rebar3]: https://rebar3.org/ +[enc]: https://github.com/davisp/erlang-native-compiler # site @@ -32,6 +41,7 @@ all your patches! - benoitc <[email protected]> - @dch314 - glejeune <[email protected]> +- Stefan Kaes <[email protected]> # performance tests diff --git a/enc b/enc new file mode 100755 index 0000000..9bcea06 Binary files /dev/null and b/enc differ diff --git a/rebar b/rebar deleted file mode 100755 index 0a43825..0000000 Binary files a/rebar and /dev/null differ diff --git a/rebar.config b/rebar.config index 4e6373e..cb89949 100644 --- a/rebar.config +++ b/rebar.config @@ -1,18 +1,12 @@ {erl_opts, [debug_info, warn_unused_vars, warn_shadow_vars, warn_unused_import]}. {eunit_opts, [verbose]}. -%% Compile nif using port compiler plugin -{plugins, [pc]}. - {artifacts, ["priv/snappy_nif.so"]}. -{port_specs, [ - {".*", "priv/snappy_nif.so", ["c_src/snappy/*.cc", "c_src/*.cc"], [{env, [{"LDFLAGS", "$LDFLAGS -lstdc++"}, {"CXXFLAGS", "$CXXFLAGS -std=c++11"}]}]} - ]}. +{port_specs, [{".*", "priv/snappy_nif.so", + ["c_src/snappy/*.cc", "c_src/*.cc"], + [{env, [{"LDFLAGS", "$LDFLAGS -lstdc++"}, + {"CXXFLAGS", "$CXXFLAGS -std=c++11"}]}]}]}. -{provider_hooks, [ - {post, [ - {compile, {pc, compile}}, - {clean, {pc, clean}} - ]} - ]}. +{pre_hooks, [{"", compile, "./enc compile"}]}. +{post_hooks, [{"", clean, "./enc clean"}]}. diff --git a/rebar3 b/rebar3 new file mode 100755 index 0000000..c7d4824 Binary files /dev/null and b/rebar3 differ
