Skip to content

Commit 80d87a7

Browse files
moteusmoteus
committed
Add. rockspecs for version 0.3.5
1 parent cfb6fb2 commit 80d87a7

File tree

6 files changed

+198
-15
lines changed

6 files changed

+198
-15
lines changed

‎.travis.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ env:
66
- LUAROCKS_VER=2.1.0
77
matrix:
88
# todo: install libffi and test ffi binding on Lua 5.1/5.2
9-
# - LUA=lua5.1 ZMQ_VER=zeromq3 LZMQ=lzmq PERF="NO" LUA_SFX=
10-
# - LUA=lua5.1 ZMQ_VER=zeromq4 LZMQ=lzmq PERF="NO" LUA_SFX=
11-
# - LUA=lua5.2 ZMQ_VER=zeromq3 LZMQ=lzmq PERF="NO" LUA_SFX=
12-
# - LUA=luajit ZMQ_VER=zeromq3 LZMQ=lzmq PERF="NO" LUA_SFX=jit
13-
# - LUA=luajit ZMQ_VER=zeromq3 LZMQ=ffi PERF="NO" LUA_SFX=jit
14-
# - LUA=luajit ZMQ_VER=zeromq4 LZMQ=ffi PERF="NO" LUA_SFX=jit
15-
# - LUA=luajit ZMQ_VER=zeromq3 LZMQ=ffi-lua PERF="NO" LUA_SFX=jit
16-
- LUA=lua5.1 ZMQ_VER=libzmq LZMQ=lzmq PERF="NO" LUA_SFX=
17-
- LUA=luajit ZMQ_VER=libzmq LZMQ=ffi-lua PERF="NO" LUA_SFX=jit
9+
- LUA=lua5.1 ZMQ_VER=zeromq3 LZMQ=lzmq PERF="NO" LUA_SFX=
10+
- LUA=lua5.1 ZMQ_VER=zeromq4 LZMQ=lzmq PERF="NO" LUA_SFX=
11+
- LUA=lua5.2 ZMQ_VER=zeromq3 LZMQ=lzmq PERF="NO" LUA_SFX=
12+
- LUA=luajit ZMQ_VER=zeromq3 LZMQ=lzmq PERF="NO" LUA_SFX=jit
13+
- LUA=luajit ZMQ_VER=zeromq3 LZMQ=ffi PERF="NO" LUA_SFX=jit
14+
- LUA=luajit ZMQ_VER=zeromq4 LZMQ=ffi PERF="NO" LUA_SFX=jit
15+
- LUA=luajit ZMQ_VER=zeromq3 LZMQ=ffi-lua PERF="NO" LUA_SFX=jit
16+
# - LUA=lua5.1 ZMQ_VER=libzmq LZMQ=lzmq PERF="NO" LUA_SFX=
17+
# - LUA=luajit ZMQ_VER=libzmq LZMQ=ffi-lua PERF="NO" LUA_SFX=jit
1818

1919
branches:
2020
only:

‎rockspecs/lzmq-0.3.5-1.rockspec

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
package = "lzmq"
2+
version = "0.3.5-1"
3+
4+
source = {
5+
url = "https://github.com/moteus/lzmq/archive/v0.3.5.zip",
6+
dir = "lzmq-0.3.5",
7+
}
8+
9+
description = {
10+
summary = "Lua bindings to ZeroMQ",
11+
homepage = "https://github.com/moteus/lzmq",
12+
license = "MIT/X11",
13+
}
14+
15+
dependencies = {
16+
"lua >= 5.1, < 5.3",
17+
-- "lua-llthreads >= 1.2"
18+
}
19+
20+
external_dependencies = {
21+
platforms = {
22+
windows = {
23+
ZMQ = {
24+
header = "zmq.h",
25+
library = "libzmq",
26+
}
27+
};
28+
unix = {
29+
ZMQ = {
30+
header = "zmq.h",
31+
-- library = "zmq", -- does not work !?
32+
}
33+
};
34+
}
35+
}
36+
37+
build = {
38+
copy_directories = {"test", "examples"},
39+
40+
type = "builtin",
41+
42+
platforms = {
43+
windows = { modules = {
44+
["lzmq"] = {
45+
libraries = {"libzmq"},
46+
}
47+
}},
48+
unix = { modules = {
49+
["lzmq"] = {
50+
libraries = {"zmq"},
51+
}
52+
}},
53+
linux = { modules = {
54+
["lzmq.timer"] = {
55+
libraries = {"rt"},
56+
},
57+
}},
58+
},
59+
60+
modules = {
61+
["lzmq"] = {
62+
sources = {'src/lzmq.c','src/lzutils.c','src/poller.c',
63+
'src/zcontext.c','src/zerror.c','src/zmsg.c',
64+
'src/zpoller.c','src/zsocket.c'},
65+
incdirs = {"$(ZMQ_INCDIR)"},
66+
libdirs = {"$(ZMQ_LIBDIR)"},
67+
defines = {
68+
'LUAZMQ_USE_SEND_AS_BUF',
69+
'LUAZMQ_USE_TEMP_BUFFERS',
70+
'LUAZMQ_USE_ERR_TYPE_OBJECT',
71+
-- 'LUAZMQ_USE_ERR_TYPE_NUMBER'
72+
-- 'LUAZMQ_USE_ERR_TYPE_STRING'
73+
},
74+
},
75+
["lzmq.timer"] = {
76+
sources = {'src/ztimer.c','src/lzutils.c'},
77+
},
78+
["lzmq.loop" ] = "src/lua/lzmq/loop.lua";
79+
["lzmq.poller" ] = "src/lua/lzmq/poller.lua";
80+
["lzmq.threads" ] = "src/lua/lzmq/threads.lua";
81+
["lzmq.ffi" ] = "src/lua/lzmq/ffi.lua";
82+
["lzmq.ffi.api" ] = "src/lua/lzmq/ffi/api.lua";
83+
["lzmq.ffi.error" ] = "src/lua/lzmq/ffi/error.lua";
84+
["lzmq.ffi.loop" ] = "src/lua/lzmq/ffi/loop.lua";
85+
["lzmq.ffi.poller" ] = "src/lua/lzmq/ffi/poller.lua";
86+
["lzmq.ffi.timer" ] = "src/lua/lzmq/ffi/timer.lua";
87+
["lzmq.ffi.threads" ] = "src/lua/lzmq/ffi/threads.lua";
88+
["lzmq.llthreads.ex" ] = "src/lua/lzmq/llthreads/ex.lua";
89+
["lzmq.impl.threads" ] = "src/lua/lzmq/impl/threads.lua";
90+
["lzmq.impl.loop" ] = "src/lua/lzmq/impl/loop.lua";
91+
},
92+
}

‎rockspecs/lzmq-ffi-0.3.5-1.rockspec

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
package = "lzmq-ffi"
2+
version = "0.3.5-1"
3+
4+
source = {
5+
url = "https://github.com/moteus/lzmq/archive/v0.3.5.zip",
6+
dir = "lzmq-0.3.5",
7+
}
8+
9+
description = {
10+
summary = "Lua bindings to ZeroMQ",
11+
homepage = "https://github.com/moteus/lzmq",
12+
license = "MIT/X11",
13+
}
14+
15+
dependencies = {
16+
"lua >= 5.1, < 5.3",
17+
-- "lua-llthreads >= 1.2"
18+
-- "lzmq-timer"
19+
}
20+
21+
build = {
22+
copy_directories = {"test", "examples"},
23+
24+
type = "builtin",
25+
26+
platforms = {
27+
linux = { modules = {
28+
["lzmq.timer"] = {
29+
libraries = {"rt"},
30+
},
31+
}},
32+
},
33+
34+
modules = {
35+
["lzmq.timer"] = {
36+
sources = {'src/ztimer.c','src/lzutils.c'},
37+
},
38+
["lzmq" ] = "src/lua/lzmq/ffi/lzmq.lua";
39+
["lzmq.ffi" ] = "src/lua/lzmq/ffi.lua";
40+
41+
["lzmq.loop" ] = "src/lua/lzmq/loop.lua";
42+
["lzmq.poller" ] = "src/lua/lzmq/ffi/poller.lua";
43+
["lzmq.threads" ] = "src/lua/lzmq/threads.lua";
44+
45+
["lzmq.ffi.api" ] = "src/lua/lzmq/ffi/api.lua";
46+
["lzmq.ffi.error" ] = "src/lua/lzmq/ffi/error.lua";
47+
48+
["lzmq.llthreads.ex" ] = "src/lua/lzmq/llthreads/ex.lua";
49+
["lzmq.impl.threads" ] = "src/lua/lzmq/impl/threads.lua";
50+
["lzmq.impl.loop" ] = "src/lua/lzmq/impl/loop.lua";
51+
},
52+
}

‎rockspecs/lzmq-timer-0.3.5-1.rockspec

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
package = "lzmq-timer"
2+
version = "0.3.5-1"
3+
4+
source = {
5+
url = "https://github.com/moteus/lzmq/archive/v0.3.5.zip",
6+
dir = "lzmq-0.3.5",
7+
}
8+
9+
description = {
10+
summary = "Milliseconds timer",
11+
homepage = "https://github.com/moteus/lzmq",
12+
license = "MIT/X11",
13+
}
14+
15+
dependencies = {
16+
"lua >= 5.1, < 5.3",
17+
}
18+
19+
build = {
20+
copy_directories = {},
21+
22+
type = "builtin",
23+
24+
platforms = {
25+
linux = { modules = {
26+
["lzmq.timer"] = {
27+
libraries = {"rt"},
28+
}
29+
}},
30+
},
31+
32+
modules = {
33+
["lzmq.timer"] = {
34+
sources = {'src/ztimer.c','src/lzutils.c'},
35+
},
36+
},
37+
}

‎src/lua/lzmq/ffi.lua

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
local LZMQ_VERSION = "0.3.5"
2+
13
local lua_version_t
24
local function lua_version()
35
if not lua_version_t then
@@ -1070,7 +1072,7 @@ end
10701072

10711073
do -- zmq
10721074

1073-
zmq._VERSION = "0.3.5-dev"
1075+
zmq._VERSION = LZMQ_VERSION
10741076

10751077
function zmq.version(unpack)
10761078
local mj,mn,pt = api.zmq_version()

‎src/lzmq.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111
#include <assert.h>
1212
#include "zsupport.h"
1313

14+
#define LUAZMQ_VERSION_MAJOR 0
15+
#define LUAZMQ_VERSION_MINOR 3
16+
#define LUAZMQ_VERSION_PATCH 5
17+
// #define LUAZMQ_VERSION_COMMENT "dev"
18+
1419
const char *LUAZMQ_CONTEXT = LUAZMQ_PREFIX "Context";
1520
const char *LUAZMQ_SOCKET = LUAZMQ_PREFIX "Socket";
1621
const char *LUAZMQ_ERROR = LUAZMQ_PREFIX "Error";
@@ -52,11 +57,6 @@ LUAZMQ_EXPORT int luazmq_socket (lua_State *L, void *skt, unsigned char own) {
5257
return 1;
5358
}
5459

55-
#define LUAZMQ_VERSION_MAJOR 0
56-
#define LUAZMQ_VERSION_MINOR 3
57-
#define LUAZMQ_VERSION_PATCH 5
58-
#define LUAZMQ_VERSION_COMMENT "dev"
59-
6060
//-----------------------------------------------------------
6161
// common
6262
//{----------------------------------------------------------

0 commit comments

Comments
 (0)