From 72dbca09652bcc8f27a6ae2662f05d8220e25a2f Mon Sep 17 00:00:00 2001 From: Alexey Melnichuk Date: Wed, 10 Jun 2015 10:56:53 +0400 Subject: [PATCH] Prepare release and bump version numbers to 0.4.3 --- README.md | 2 +- dist.info | 2 +- rockspecs/lzmq-0.4.3-1.rockspec | 92 +++++++++++++++++++++++++++++ rockspecs/lzmq-ffi-0.4.3-1.rockspec | 52 ++++++++++++++++ src/lua/lzmq/ffi.lua | 2 +- src/lzmq.c | 2 +- 6 files changed, 148 insertions(+), 4 deletions(-) create mode 100644 rockspecs/lzmq-0.4.3-1.rockspec create mode 100644 rockspecs/lzmq-ffi-0.4.3-1.rockspec diff --git a/README.md b/README.md index c355573..12a9d08 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![Coverage Status](https://coveralls.io/repos/zeromq/lzmq/badge.png?branch=master)](https://coveralls.io/r/zeromq/lzmq?branch=master) [![Licence](http://img.shields.io/badge/Licence-MIT-brightgreen.svg)](LICENCE.txt) -Support ZeroMQ 3.2/4.0.
+Support ZeroMQ version 3.2.x/4.x
This library is not dropin replacement for [lua-zmq](https://github.com/Neopallium/lua-zmq) library.
This library has C and FFI version of binding. diff --git a/dist.info b/dist.info index d430a62..55cddb3 100644 --- a/dist.info +++ b/dist.info @@ -1,5 +1,5 @@ name = "lzmq" -version = "0.4.2" +version = "0.4.3" desc = "Lua bindings to ZeroMQ" author = "Alexey Melnichuk" diff --git a/rockspecs/lzmq-0.4.3-1.rockspec b/rockspecs/lzmq-0.4.3-1.rockspec new file mode 100644 index 0000000..d218adc --- /dev/null +++ b/rockspecs/lzmq-0.4.3-1.rockspec @@ -0,0 +1,92 @@ +package = "lzmq" +version = "0.4.3-1" + +source = { + url = "https://github.com/zeromq/lzmq/archive/v0.4.3.zip", + dir = "lzmq-0.4.3", +} + +description = { + summary = "Lua bindings to ZeroMQ", + homepage = "https://github.com/zeromq/lzmq", + license = "MIT/X11", +} + +dependencies = { + "lua >= 5.1, < 5.4", + -- "lua-llthreads2 >= 0.1.2" +} + +external_dependencies = { + platforms = { + windows = { + ZMQ = { + header = "zmq.h", + library = "libzmq", + } + }; + unix = { + ZMQ = { + header = "zmq.h", + -- library = "zmq", -- does not work !? + } + }; + } +} + +build = { + copy_directories = {"test", "examples"}, + + type = "builtin", + + platforms = { + windows = { modules = { + ["lzmq"] = { + libraries = {"libzmq"}, + } + }}, + unix = { modules = { + ["lzmq"] = { + libraries = {"zmq"}, + } + }}, + linux = { modules = { + ["lzmq.timer"] = { + libraries = {"rt"}, + }, + }}, + }, + + modules = { + ["lzmq"] = { + sources = {'src/lzmq.c','src/lzutils.c','src/poller.c', + 'src/zcontext.c','src/zerror.c','src/zmsg.c', + 'src/zpoller.c','src/zsocket.c'}, + incdirs = {"$(ZMQ_INCDIR)"}, + libdirs = {"$(ZMQ_LIBDIR)"}, + defines = { + 'LUAZMQ_USE_SEND_AS_BUF', + 'LUAZMQ_USE_TEMP_BUFFERS', + 'LUAZMQ_USE_ERR_TYPE_OBJECT', + -- 'LUAZMQ_USE_ERR_TYPE_NUMBER' + -- 'LUAZMQ_USE_ERR_TYPE_STRING' + }, + }, + ["lzmq.timer"] = { + sources = {'src/ztimer.c','src/lzutils.c'}, + }, + ["lzmq.loop" ] = "src/lua/lzmq/loop.lua"; + ["lzmq.poller" ] = "src/lua/lzmq/poller.lua"; + ["lzmq.threads" ] = "src/lua/lzmq/threads.lua"; + ["lzmq.ffi" ] = "src/lua/lzmq/ffi.lua"; + ["lzmq.ffi.api" ] = "src/lua/lzmq/ffi/api.lua"; + ["lzmq.ffi.error" ] = "src/lua/lzmq/ffi/error.lua"; + ["lzmq.ffi.loop" ] = "src/lua/lzmq/ffi/loop.lua"; + ["lzmq.ffi.poller" ] = "src/lua/lzmq/ffi/poller.lua"; + ["lzmq.ffi.timer" ] = "src/lua/lzmq/ffi/timer.lua"; + ["lzmq.ffi.threads" ] = "src/lua/lzmq/ffi/threads.lua"; + ["lzmq.llthreads.ex" ] = "src/lua/lzmq/llthreads/ex.lua"; + ["lzmq.impl.threads" ] = "src/lua/lzmq/impl/threads.lua"; + ["lzmq.impl.loop" ] = "src/lua/lzmq/impl/loop.lua"; + }, +} diff --git a/rockspecs/lzmq-ffi-0.4.3-1.rockspec b/rockspecs/lzmq-ffi-0.4.3-1.rockspec new file mode 100644 index 0000000..8b0ba44 --- /dev/null +++ b/rockspecs/lzmq-ffi-0.4.3-1.rockspec @@ -0,0 +1,52 @@ +package = "lzmq-ffi" +version = "0.4.3-1" + +source = { + url = "https://github.com/zeromq/lzmq/archive/v0.4.3.zip", + dir = "lzmq-0.4.3", +} + +description = { + summary = "Lua bindings to ZeroMQ", + homepage = "https://github.com/zeromq/lzmq", + license = "MIT/X11", +} + +dependencies = { + "lua >= 5.1, < 5.4", + -- "lua-llthreads2 >= 0.1.2" + -- "lzmq-timer" +} + +build = { + copy_directories = {"test", "examples"}, + + type = "builtin", + + platforms = { + linux = { modules = { + ["lzmq.timer"] = { + libraries = {"rt"}, + }, + }}, + }, + + modules = { + ["lzmq.timer"] = { + sources = {'src/ztimer.c','src/lzutils.c'}, + }, + ["lzmq" ] = "src/lua/lzmq/ffi/lzmq.lua"; + ["lzmq.ffi" ] = "src/lua/lzmq/ffi.lua"; + + ["lzmq.loop" ] = "src/lua/lzmq/loop.lua"; + ["lzmq.poller" ] = "src/lua/lzmq/ffi/poller.lua"; + ["lzmq.threads" ] = "src/lua/lzmq/threads.lua"; + + ["lzmq.ffi.api" ] = "src/lua/lzmq/ffi/api.lua"; + ["lzmq.ffi.error" ] = "src/lua/lzmq/ffi/error.lua"; + + ["lzmq.llthreads.ex" ] = "src/lua/lzmq/llthreads/ex.lua"; + ["lzmq.impl.threads" ] = "src/lua/lzmq/impl/threads.lua"; + ["lzmq.impl.loop" ] = "src/lua/lzmq/impl/loop.lua"; + }, +} diff --git a/src/lua/lzmq/ffi.lua b/src/lua/lzmq/ffi.lua index 4344240..1d32bb7 100644 --- a/src/lua/lzmq/ffi.lua +++ b/src/lua/lzmq/ffi.lua @@ -8,7 +8,7 @@ -- This file is part of lua-lzqm library. -- -local LZMQ_VERSION = "0.4.3-dev" +local LZMQ_VERSION = "0.4.3" local lua_version_t local function lua_version() diff --git a/src/lzmq.c b/src/lzmq.c index a0ee9bd..4eed076 100644 --- a/src/lzmq.c +++ b/src/lzmq.c @@ -25,7 +25,7 @@ #define LUAZMQ_VERSION_MAJOR 0 #define LUAZMQ_VERSION_MINOR 4 #define LUAZMQ_VERSION_PATCH 3 -#define LUAZMQ_VERSION_COMMENT "dev" +// #define LUAZMQ_VERSION_COMMENT "dev" const char *LUAZMQ_CONTEXT = LUAZMQ_PREFIX "Context"; const char *LUAZMQ_SOCKET = LUAZMQ_PREFIX "Socket";