aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Germain <bnt period germain arrobase gmail period com>2015-04-27 14:20:08 +0200
committerBenoit Germain <bnt period germain arrobase gmail period com>2015-04-27 14:20:08 +0200
commit295ba159356050037419cbdb5ba1d1e3362ce391 (patch)
tree4cfc569951a2f5203fe2ee3b2c1cda7ce1545c25
parenta4e2a434cbbc7243638d0451cbf38c3b5a14910a (diff)
downloadlanes-295ba159356050037419cbdb5ba1d1e3362ce391.tar.gz
lanes-295ba159356050037419cbdb5ba1d1e3362ce391.tar.bz2
lanes-295ba159356050037419cbdb5ba1d1e3362ce391.zip
Preparing next releasev3.10.0
-rw-r--r--CHANGES7
-rw-r--r--docs/index.html6
-rw-r--r--lanes-3.10.0-1.rockspec66
-rw-r--r--src/lanes.c2
4 files changed, 76 insertions, 5 deletions
diff --git a/CHANGES b/CHANGES
index 7c03916..90b5196 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,11 @@
1CHANGES: 1CHANGES:
2 2
3CHANGE 115: BGe 18-sep-14 3CHANGE 116: BGe, mpeterv 27-Apr-15
4 * bumped version to 3.10.0
5 * segfault fixed in LG_lane_new
6 * Lua 5.3 support
7
8CHANGE 115: BGe 18-Sep-14
4 * bumped version to 3.9.7 9 * bumped version to 3.9.7
5 * new function lanes.sleep() 10 * new function lanes.sleep()
6 11
diff --git a/docs/index.html b/docs/index.html
index e8dc94b..b3fccc3 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -64,13 +64,13 @@
64 <font size="-1"> 64 <font size="-1">
65 <p> 65 <p>
66 <br/> 66 <br/>
67 <i>Copyright &copy; 2007-14 Asko Kauppi, Benoit Germain. All rights reserved.</i> 67 <i>Copyright &copy; 2007-15 Asko Kauppi, Benoit Germain. All rights reserved.</i>
68 <br/> 68 <br/>
69 Lua Lanes is published under the same <a href="http://en.wikipedia.org/wiki/MIT_License">MIT license</a> as Lua 5.1 and 5.2. 69 Lua Lanes is published under the same <a href="http://en.wikipedia.org/wiki/MIT_License">MIT license</a> as Lua 5.1, 5.2, and 5.3.
70 </p> 70 </p>
71 71
72 <p> 72 <p>
73 This document was revised on 18-Sep-14, and applies to version <tt>3.9.7</tt>. 73 This document was revised on 27-Apr-15, and applies to version <tt>3.10.0</tt>.
74 </p> 74 </p>
75 </font> 75 </font>
76 </center> 76 </center>
diff --git a/lanes-3.10.0-1.rockspec b/lanes-3.10.0-1.rockspec
new file mode 100644
index 0000000..3e2536f
--- /dev/null
+++ b/lanes-3.10.0-1.rockspec
@@ -0,0 +1,66 @@
1--
2-- Lanes rockspec
3--
4-- Ref:
5-- <http://luarocks.org/en/Rockspec_format>
6--
7
8package = "Lanes"
9
10version = "3.10.0-1"
11
12source= {
13 url= "git://github.com/LuaLanes/lanes.git",
14 branch= "v3.10.0"
15}
16
17description = {
18 summary= "Multithreading support for Lua",
19 detailed= [[
20 Lua Lanes is a portable, message passing multithreading library
21 providing the possibility to run multiple Lua states in parallel.
22 ]],
23 license= "MIT/X11",
24 homepage="https://github.com/LuaLanes/lanes",
25 maintainer="Benoit Germain <bnt.germain@gmail.com>"
26}
27
28-- Q: What is the difference of "windows" and "win32"? Seems there is none;
29-- so should we list either one or both?
30--
31supported_platforms= { "win32",
32 "macosx",
33 "linux",
34 "freebsd", -- TBD: not tested
35 "msys", -- TBD: not supported by LuaRocks 1.0 (or is it?)
36}
37
38dependencies= {
39 "lua >= 5.1", -- builds with either 5.1, 5.2 and 5.3
40}
41
42build = {
43 type = "builtin",
44 platforms =
45 {
46 linux =
47 {
48 modules =
49 {
50 ["lanes.core"] =
51 {
52 libraries = "pthread"
53 },
54 }
55 }
56 },
57 modules =
58 {
59 ["lanes.core"] =
60 {
61 sources = { "src/compat.c", "src/deep.c", "src/lanes.c", "src/keeper.c", "src/tools.c", "src/threading.c"},
62 incdirs = { "src"},
63 },
64 lanes = "src/lanes.lua"
65 }
66}
diff --git a/src/lanes.c b/src/lanes.c
index 8852687..2cb1af8 100644
--- a/src/lanes.c
+++ b/src/lanes.c
@@ -52,7 +52,7 @@
52 * ... 52 * ...
53 */ 53 */
54 54
55char const* VERSION = "3.9.7"; 55char const* VERSION = "3.10.0";
56 56
57/* 57/*
58=============================================================================== 58===============================================================================