aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Melnichuk <mimir@newmail.ru>2014-06-23 09:47:29 +0500
committerAlexey Melnichuk <mimir@newmail.ru>2014-06-23 09:47:29 +0500
commit6cae0b69e644b7e6395bd8774dfbb838f985c439 (patch)
tree76cf518405fa7f876e199627088a0e95c4d7a533
parent0c30fad3da0a8a3a53303b50fe45785ad4e1893d (diff)
downloadlua-llthreads2-6cae0b69e644b7e6395bd8774dfbb838f985c439.tar.gz
lua-llthreads2-6cae0b69e644b7e6395bd8774dfbb838f985c439.tar.bz2
lua-llthreads2-6cae0b69e644b7e6395bd8774dfbb838f985c439.zip
Fix. `compat` rockspec install `llthreads.ex` module.
Update Travis files.
-rw-r--r--.travis.yml13
-rw-r--r--.travis/platform.sh15
-rw-r--r--.travis/setup_lua.sh76
-rw-r--r--rockspecs/lua-llthreads2-compat-scm-0.rockspec2
4 files changed, 88 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml
index 2b95fdd..febe50b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,12 +2,11 @@ language: objective-c
2 2
3env: 3env:
4 global: 4 global:
5 - PLATFORM=macosx 5 - LUAROCKS=2.2.0beta1
6 - LUAROCKS_VER=2.1.0
7 matrix: 6 matrix:
8 - LUA=lua5.1 LUA_SFX= 7 - LUA=lua5.1
9 - LUA=lua5.2 LUA_SFX= 8 - LUA=lua5.2
10 - LUA=luajit LUA_SFX=jit 9 - LUA=luajit
11 10
12branches: 11branches:
13 only: 12 only:
@@ -24,8 +23,8 @@ install:
24script: 23script:
25 - cd test 24 - cd test
26 - lua$LUA_SFX test_table_copy.lua 25 - lua$LUA_SFX test_table_copy.lua
27 - lua$LUA_SFX test_threads.lua 26 - lua$LUA_SFX test_threads.lua 10
28 - lua$LUA_SFX test_llthreads.lua 10 27 - lua$LUA_SFX test_llthreads.lua
29 # - lua$LUA_SFX test_register_llthreads.lua 28 # - lua$LUA_SFX test_register_llthreads.lua
30 - lua$LUA_SFX test_join_timeout.lua 29 - lua$LUA_SFX test_join_timeout.lua
31 - lua$LUA_SFX test_join_detach.lua 30 - lua$LUA_SFX test_join_detach.lua
diff --git a/.travis/platform.sh b/.travis/platform.sh
new file mode 100644
index 0000000..4a3af0d
--- /dev/null
+++ b/.travis/platform.sh
@@ -0,0 +1,15 @@
1if [ -z "$PLATFORM" ]; then
2 PLATFORM=$TRAVIS_OS_NAME;
3fi
4
5if [ "$PLATFORM" == "osx" ]; then
6 PLATFORM="macosx";
7fi
8
9if [ -z "$PLATFORM" ]; then
10 if [ "$(uname)" == "Linux" ]; then
11 PLATFORM="linux";
12 else
13 PLATFORM="macosx";
14 fi;
15fi
diff --git a/.travis/setup_lua.sh b/.travis/setup_lua.sh
index 47ce49c..9841cb5 100644
--- a/.travis/setup_lua.sh
+++ b/.travis/setup_lua.sh
@@ -1,13 +1,54 @@
1#! /bin/bash
2
1# A script for setting up environment for travis-ci testing. 3# A script for setting up environment for travis-ci testing.
2# Sets up Lua and Luarocks. 4# Sets up Lua and Luarocks.
3# LUA must be "lua5.1", "lua5.2" or "luajit". 5# LUA must be "lua5.1", "lua5.2" or "luajit".
4# PLATFORM must be "linux" or "macosx". 6# luajit2.0 - master v2.0
7# luajit2.1 - master v2.1
8
9LUAJIT_BASE="LuaJIT-2.0.3"
10
11source .travis/platform.sh
12
13LUAJIT="no"
14
15if [ "$PLATFORM" == "macosx" ]; then
16 if [ "$LUA" == "luajit" ]; then
17 LUAJIT="yes";
18 fi
19 if [ "$LUA" == "luajit2.0" ]; then
20 LUAJIT="yes";
21 fi
22 if [ "$LUA" == "luajit2.1" ]; then
23 LUAJIT="yes";
24 fi;
25elif [ "$(expr substr $LUA 1 6)" == "luajit" ]; then
26 LUAJIT="yes";
27fi
28
29if [ "$LUAJIT" == "yes" ]; then
30
31 if [ "$LUA" == "luajit" ]; then
32 curl http://luajit.org/download/$LUAJIT_BASE.tar.gz | tar xz;
33 else
34 git clone http://luajit.org/git/luajit-2.0.git $LUAJIT_BASE;
35 fi
36
37 cd $LUAJIT_BASE
38
39 if [ "$LUA" == "luajit2.1" ]; then
40 git checkout v2.1;
41 fi
5 42
6if [ "$LUA" == "luajit" ]; then
7 curl http://luajit.org/download/LuaJIT-2.0.2.tar.gz | tar xz
8 cd LuaJIT-2.0.2
9 make && sudo make install 43 make && sudo make install
10 cd $TRAVIS_BUILD_DIR; 44
45 if [ "$LUA" == "luajit2.1" ]; then
46 sudo ln -s /usr/local/bin/luajit-2.1.0-alpha /usr/local/bin/luajit
47 sudo ln -s /usr/local/bin/luajit /usr/local/bin/lua;
48 else
49 sudo ln -s /usr/local/bin/luajit /usr/local/bin/lua;
50 fi;
51
11else 52else
12 if [ "$LUA" == "lua5.1" ]; then 53 if [ "$LUA" == "lua5.1" ]; then
13 curl http://www.lua.org/ftp/lua-5.1.5.tar.gz | tar xz 54 curl http://www.lua.org/ftp/lua-5.1.5.tar.gz | tar xz
@@ -16,20 +57,35 @@ else
16 curl http://www.lua.org/ftp/lua-5.2.3.tar.gz | tar xz 57 curl http://www.lua.org/ftp/lua-5.2.3.tar.gz | tar xz
17 cd lua-5.2.3; 58 cd lua-5.2.3;
18 fi 59 fi
19 sudo make $PLATFORM install 60 sudo make $PLATFORM install;
20 cd $TRAVIS_BUILD_DIR;
21fi 61fi
22 62
23LUAROCKS_BASE=luarocks-$LUAROCKS_VER 63cd $TRAVIS_BUILD_DIR;
64
65LUAROCKS_BASE=luarocks-$LUAROCKS
24curl http://luarocks.org/releases/$LUAROCKS_BASE.tar.gz | tar xz 66curl http://luarocks.org/releases/$LUAROCKS_BASE.tar.gz | tar xz
25cd $LUAROCKS_BASE; 67cd $LUAROCKS_BASE;
26 68
27if [ "$LUA" == "luajit" ]; then 69if [ "$LUA" == "luajit" ]; then
28 ./configure --lua-suffix=jit --with-lua-include=/usr/local/include/luajit-2.0; 70 ./configure --lua-suffix=jit --with-lua-include=/usr/local/include/luajit-2.0;
71elif [ "$LUA" == "luajit2.0" ]; then
72 ./configure --lua-suffix=jit --with-lua-include=/usr/local/include/luajit-2.0;
73elif [ "$LUA" == "luajit2.1" ]; then
74 ./configure --lua-suffix=jit --with-lua-include=/usr/local/include/luajit-2.1;
29else 75else
30 ./configure; 76 ./configure;
31fi 77fi
32 78
33make && sudo make install 79make build && sudo make install
80
81cd $TRAVIS_BUILD_DIR
34 82
35cd $TRAVIS_BUILD_DIR \ No newline at end of file 83rm -rf $LUAROCKS_BASE
84
85if [ "$LUAJIT" == "yes" ]; then
86 rm -rf $LUAJIT_BASE;
87elif [ "$LUA" == "lua5.1" ]; then
88 rm -rf lua-5.1.5;
89elif [ "$LUA" == "lua5.2" ]; then
90 rm -rf lua-5.2.3;
91fi
diff --git a/rockspecs/lua-llthreads2-compat-scm-0.rockspec b/rockspecs/lua-llthreads2-compat-scm-0.rockspec
index 67a062d..bbb3ecd 100644
--- a/rockspecs/lua-llthreads2-compat-scm-0.rockspec
+++ b/rockspecs/lua-llthreads2-compat-scm-0.rockspec
@@ -40,6 +40,6 @@ build = {
40 sources = { "src/l52util.c", "src/llthread.c" }, 40 sources = { "src/l52util.c", "src/llthread.c" },
41 defines = { "LLTHREAD_MODULE_NAME=llthreads" }, 41 defines = { "LLTHREAD_MODULE_NAME=llthreads" },
42 }, 42 },
43 ["llthreads2.ex"] = "src/lua/llthreads2/ex.lua", 43 ["llthreads.ex"] = "src/lua/llthreads2/ex.lua",
44 } 44 }
45} \ No newline at end of file 45} \ No newline at end of file