From e33999a890c8bfdb0c1f753820e4261dabb67faa Mon Sep 17 00:00:00 2001 From: Alexey Melnichuk Date: Sun, 1 Jul 2018 11:20:35 +0300 Subject: Release 0.1.5 --- .travis.yml | 29 +++++++-------- rockspecs/lua-llthreads2-0.1.5-1.rockspec | 45 ++++++++++++++++++++++++ rockspecs/lua-llthreads2-compat-0.1.5-1.rockspec | 45 ++++++++++++++++++++++++ src/llthread.c | 2 +- 4 files changed, 103 insertions(+), 18 deletions(-) create mode 100644 rockspecs/lua-llthreads2-0.1.5-1.rockspec create mode 100644 rockspecs/lua-llthreads2-compat-0.1.5-1.rockspec diff --git a/.travis.yml b/.travis.yml index c4f54b4..d629f05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,24 +1,20 @@ +language: c + sudo: false matrix: include: - - compiler: ": Lua51-osx" - env: LUA="lua 5.1" + - env: LUA="lua 5.1" os: osx - - compiler: ": Lua51" - env: LUA="lua 5.1" + - env: LUA="lua 5.1" os: linux - - compiler: ": Lua52" - env: LUA="lua 5.2" + - env: LUA="lua 5.2" os: linux - - compiler: ": Lua53" - env: LUA="lua 5.3" + - env: LUA="lua 5.3" os: linux - - compiler: ": LuaJIT20" - env: LUA="luajit 2.0" + - env: LUA="luajit 2.0" os: linux - - compiler: ": LuaJIT21" - env: LUA="luajit 2.1" + - env: LUA="luajit 2.1" os: linux cache: @@ -29,14 +25,13 @@ cache: branches: only: - master + - curl_mime before_install: - - export CC=gcc - - gcc --version - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH=$PATH:~/Library/Python/2.7/bin/; fi - - pip install --user hererocks - - hererocks here -r^ --$LUA; - - export PATH=$PATH:$PWD/here/bin + - pip2 install --user hererocks + - hererocks here -r^ --$LUA + - source here/bin/activate install: - luarocks make rockspecs/lua-llthreads2-compat-scm-0.rockspec diff --git a/rockspecs/lua-llthreads2-0.1.5-1.rockspec b/rockspecs/lua-llthreads2-0.1.5-1.rockspec new file mode 100644 index 0000000..ebe843c --- /dev/null +++ b/rockspecs/lua-llthreads2-0.1.5-1.rockspec @@ -0,0 +1,45 @@ +package = "lua-llthreads2" +version = "0.1.5-1" +source = { + url = "https://github.com/moteus/lua-llthreads2/archive/v0.1.5.zip", + dir = "lua-llthreads2-0.1.5", +} +description = { + summary = "Low-Level threads for Lua", + homepage = "http://github.com/moteus/lua-llthreads2", + license = "MIT/X11", + detailed = [[ + This is drop-in replacement for `lua-llthread` module but the module called `llthreads2`. + In additional module supports: thread join with zero timeout; logging thread errors with + custom logger; run detached joinable threads; pass cfunctions as argument to child thread. + ]], +} +dependencies = { + "lua >= 5.1, < 5.4", +} +build = { + type = "builtin", + platforms = { + unix = { + modules = { + llthreads2 = { + libraries = {"pthread"}, + } + } + }, + windows = { + modules = { + llthreads2 = { + libraries = {"kernel32"}, + } + } + } + }, + modules = { + llthreads2 = { + sources = { "src/l52util.c", "src/llthread.c" }, + defines = { "LLTHREAD_MODULE_NAME=llthreads2" }, + }, + ["llthreads2.ex"] = "src/lua/llthreads2/ex.lua", + } +} \ No newline at end of file diff --git a/rockspecs/lua-llthreads2-compat-0.1.5-1.rockspec b/rockspecs/lua-llthreads2-compat-0.1.5-1.rockspec new file mode 100644 index 0000000..9fd4bf4 --- /dev/null +++ b/rockspecs/lua-llthreads2-compat-0.1.5-1.rockspec @@ -0,0 +1,45 @@ +package = "lua-llthreads2-compat" +version = "0.1.5-1" +source = { + url = "https://github.com/moteus/lua-llthreads2/archive/v0.1.5.zip", + dir = "lua-llthreads2-0.1.5", +} +description = { + summary = "Low-Level threads for Lua", + homepage = "http://github.com/moteus/lua-llthreads2", + license = "MIT/X11", + detailed = [[ + This is drop-in replacement for `lua-llthread` module. + In additional module supports: thread join with zero timeout; logging thread errors with + custom logger; run detached joinable threads; pass cfunctions as argument to child thread. + ]], +} +dependencies = { + "lua >= 5.1, < 5.4", +} +build = { + type = "builtin", + platforms = { + unix = { + modules = { + llthreads = { + libraries = {"pthread"}, + } + } + }, + windows = { + modules = { + llthreads = { + libraries = {"kernel32"}, + } + } + } + }, + modules = { + llthreads = { + sources = { "src/l52util.c", "src/llthread.c" }, + defines = { "LLTHREAD_MODULE_NAME=llthreads" }, + }, + ["llthreads.ex"] = "src/lua/llthreads2/ex.lua", + } +} \ No newline at end of file diff --git a/src/llthread.c b/src/llthread.c index eb0c861..3155113 100644 --- a/src/llthread.c +++ b/src/llthread.c @@ -5,7 +5,7 @@ #define LLTHREAD_VERSION_MAJOR 0 #define LLTHREAD_VERSION_MINOR 1 #define LLTHREAD_VERSION_PATCH 5 -#define LLTHREAD_VERSION_COMMENT "dev" +// #define LLTHREAD_VERSION_COMMENT "dev" #ifndef USE_PTHREAD # include -- cgit v1.2.3-55-g6feb