From 6cae0b69e644b7e6395bd8774dfbb838f985c439 Mon Sep 17 00:00:00 2001
From: Alexey Melnichuk <mimir@newmail.ru>
Date: Mon, 23 Jun 2014 09:47:29 +0500
Subject: Fix. `compat` rockspec install `llthreads.ex` module. Update Travis
 files.

---
 .travis.yml                                    | 13 ++---
 .travis/platform.sh                            | 15 +++++
 .travis/setup_lua.sh                           | 76 ++++++++++++++++++++++----
 rockspecs/lua-llthreads2-compat-scm-0.rockspec |  2 +-
 4 files changed, 88 insertions(+), 18 deletions(-)
 create mode 100644 .travis/platform.sh

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
 
 env:
   global:
-    - PLATFORM=macosx
-    - LUAROCKS_VER=2.1.0
+    - LUAROCKS=2.2.0beta1
   matrix:
-    - LUA=lua5.1 LUA_SFX=
-    - LUA=lua5.2 LUA_SFX=
-    - LUA=luajit LUA_SFX=jit
+    - LUA=lua5.1
+    - LUA=lua5.2
+    - LUA=luajit
 
 branches:
   only:
@@ -24,8 +23,8 @@ install:
 script: 
   - cd test
   - lua$LUA_SFX test_table_copy.lua
-  - lua$LUA_SFX test_threads.lua
-  - lua$LUA_SFX test_llthreads.lua 10
+  - lua$LUA_SFX test_threads.lua 10
+  - lua$LUA_SFX test_llthreads.lua
   # - lua$LUA_SFX test_register_llthreads.lua
   - lua$LUA_SFX test_join_timeout.lua
   - 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 @@
+if [ -z "$PLATFORM" ]; then
+  PLATFORM=$TRAVIS_OS_NAME;
+fi
+
+if [ "$PLATFORM" == "osx" ]; then
+  PLATFORM="macosx";
+fi
+
+if [ -z "$PLATFORM" ]; then
+  if [ "$(uname)" == "Linux" ]; then
+    PLATFORM="linux";
+  else
+    PLATFORM="macosx";
+  fi;
+fi
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 @@
+#! /bin/bash
+
 # A script for setting up environment for travis-ci testing.
 # Sets up Lua and Luarocks.
 # LUA must be "lua5.1", "lua5.2" or "luajit".
-# PLATFORM must be "linux" or "macosx".
+# luajit2.0 - master v2.0
+# luajit2.1 - master v2.1
+
+LUAJIT_BASE="LuaJIT-2.0.3"
+
+source .travis/platform.sh
+
+LUAJIT="no"
+
+if [ "$PLATFORM" == "macosx" ]; then
+  if [ "$LUA" == "luajit" ]; then
+    LUAJIT="yes";
+  fi
+  if [ "$LUA" == "luajit2.0" ]; then
+    LUAJIT="yes";
+  fi
+  if [ "$LUA" == "luajit2.1" ]; then
+    LUAJIT="yes";
+  fi;
+elif [ "$(expr substr $LUA 1 6)" == "luajit" ]; then
+  LUAJIT="yes";
+fi
+
+if [ "$LUAJIT" == "yes" ]; then
+
+  if [ "$LUA" == "luajit" ]; then
+    curl http://luajit.org/download/$LUAJIT_BASE.tar.gz | tar xz;
+  else
+    git clone http://luajit.org/git/luajit-2.0.git $LUAJIT_BASE;
+  fi
+
+  cd $LUAJIT_BASE
+
+  if [ "$LUA" == "luajit2.1" ]; then
+    git checkout v2.1;
+  fi
 
-if [ "$LUA" == "luajit" ]; then
-  curl http://luajit.org/download/LuaJIT-2.0.2.tar.gz | tar xz
-  cd LuaJIT-2.0.2
   make && sudo make install
-  cd $TRAVIS_BUILD_DIR;
+
+  if [ "$LUA" == "luajit2.1" ]; then
+    sudo ln -s /usr/local/bin/luajit-2.1.0-alpha /usr/local/bin/luajit
+    sudo ln -s /usr/local/bin/luajit /usr/local/bin/lua;
+  else
+    sudo ln -s /usr/local/bin/luajit /usr/local/bin/lua;
+  fi;
+
 else
   if [ "$LUA" == "lua5.1" ]; then
     curl http://www.lua.org/ftp/lua-5.1.5.tar.gz | tar xz
@@ -16,20 +57,35 @@ else
     curl http://www.lua.org/ftp/lua-5.2.3.tar.gz | tar xz
     cd lua-5.2.3;
   fi
-  sudo make $PLATFORM install
-  cd $TRAVIS_BUILD_DIR;
+  sudo make $PLATFORM install;
 fi
 
-LUAROCKS_BASE=luarocks-$LUAROCKS_VER
+cd $TRAVIS_BUILD_DIR;
+
+LUAROCKS_BASE=luarocks-$LUAROCKS
 curl http://luarocks.org/releases/$LUAROCKS_BASE.tar.gz | tar xz
 cd $LUAROCKS_BASE;
 
 if [ "$LUA" == "luajit" ]; then
   ./configure --lua-suffix=jit --with-lua-include=/usr/local/include/luajit-2.0;
+elif [ "$LUA" == "luajit2.0" ]; then
+  ./configure --lua-suffix=jit --with-lua-include=/usr/local/include/luajit-2.0;
+elif [ "$LUA" == "luajit2.1" ]; then
+  ./configure --lua-suffix=jit --with-lua-include=/usr/local/include/luajit-2.1;
 else
   ./configure;
 fi
 
-make && sudo make install
+make build && sudo make install
+
+cd $TRAVIS_BUILD_DIR
 
-cd $TRAVIS_BUILD_DIR
\ No newline at end of file
+rm -rf $LUAROCKS_BASE
+
+if [ "$LUAJIT" == "yes" ]; then
+  rm -rf $LUAJIT_BASE;
+elif [ "$LUA" == "lua5.1" ]; then
+  rm -rf lua-5.1.5;
+elif [ "$LUA" == "lua5.2" ]; then
+  rm -rf lua-5.2.3;
+fi
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 = {
       sources = { "src/l52util.c", "src/llthread.c" },
       defines = { "LLTHREAD_MODULE_NAME=llthreads"  },
     },
-    ["llthreads2.ex"] = "src/lua/llthreads2/ex.lua",
+    ["llthreads.ex"] = "src/lua/llthreads2/ex.lua",
   }
 }
\ No newline at end of file
-- 
cgit v1.2.3-55-g6feb