Change travis files.

2 files changed, 40 insertions, 27 deletions

diff --git a/.travis.yml b/.travis.yml
index dc2ef16..645c612 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,41 +2,19 @@ language: erlang
 
 env:
   global:
+    - PLATFORM=linux
     - LUAROCKS_VER=2.1.0
-    - LUAROCKS_BASE=luarocks-$LUAROCKS_VER
-    - LUAROCKS_INSTALL=wget
-    - LUAROCKS_GITTAG=master
-    # - LUAROCKS_GITTAG=v$LUAROCKS_VER
   matrix:
-    - LUA=lua5.1 LUA_DEV=liblua5.1-dev     LUA_VER=5.1 LUA_SFX=5.1 LUA_INCDIR=/usr/include/lua5.1
-    - LUA=lua5.2 LUA_DEV=liblua5.2-dev     LUA_VER=5.2 LUA_SFX=5.2 LUA_INCDIR=/usr/include/lua5.2
-    - LUA=luajit LUA_DEV=libluajit-5.1-dev LUA_VER=5.1 LUA_SFX=jit LUA_INCDIR=/usr/include/luajit-2.0
+    - LUA=lua5.1 LUA_SFX=
+    - LUA=lua5.2 LUA_SFX=
+    - LUA=luajit LUA_SFX=jit
 
 branches:
   only:
     - master
 
 before_install:
-  - if [ $LUA = "luajit" ]; then
-      sudo add-apt-repository ppa:mwild1/ppa -y && sudo apt-get update -y;
-    fi
-  - sudo apt-get install $LUA
-  - sudo apt-get install $LUA_DEV
-  - lua$LUA_SFX -v
-  # Install a recent luarocks release
-  - if [ $LUAROCKS_INSTALL = "git" ]; then
-      git clone https://github.com/keplerproject/luarocks.git;
-      cd luarocks;
-      git checkout $LUAROCKS_GITTAG;
-    else
-      wget http://luarocks.org/releases/$LUAROCKS_BASE.tar.gz;
-      tar zxvpf $LUAROCKS_BASE.tar.gz;
-      cd $LUAROCKS_BASE;
-    fi
-  - ./configure --lua-version=$LUA_VER --lua-suffix=$LUA_SFX --with-lua-include="$LUA_INCDIR"
-  - sudo make 
-  - sudo make install
-  - cd $TRAVIS_BUILD_DIR
+  - bash .travis/setup_lua.sh
 
 install:
   - sudo luarocks install lunitx
diff --git a/.travis/setup_lua.sh b/.travis/setup_lua.sh
new file mode 100644
index 0000000..47ce49c
--- /dev/null
+++ b/.travis/setup_lua.sh
@@ -0,0 +1,35 @@
+# 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".
+
+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;
+else
+  if [ "$LUA" == "lua5.1" ]; then
+    curl http://www.lua.org/ftp/lua-5.1.5.tar.gz | tar xz
+    cd lua-5.1.5;
+  elif [ "$LUA" == "lua5.2" ]; then
+    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;
+fi
+
+LUAROCKS_BASE=luarocks-$LUAROCKS_VER
+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;
+else
+  ./configure;
+fi
+
+make && sudo make install
+
+cd $TRAVIS_BUILD_DIR
\ No newline at end of file