From 4db6fc29aa428955453ee5dc249d7f36b7e7d471 Mon Sep 17 00:00:00 2001
From: "Robert G. Jakabosky" <bobby@sharedrealm.com>
Date: Sat, 23 Jan 2016 00:02:21 +0800
Subject: [PATCH] Revert all changes to .travis.yml file.

---
 .travis.yml               | 66 +++++++++++++++++++++++++++++++++++++--
 scripts/travis_build.sh   | 20 ------------
 scripts/travis_install.sh | 22 -------------
 3 files changed, 64 insertions(+), 44 deletions(-)
 delete mode 100755 scripts/travis_build.sh
 delete mode 100755 scripts/travis_install.sh

diff --git a/.travis.yml b/.travis.yml
index dfbca5a..9a579b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,68 @@
 language: c
 
-compiler: clang
+env:
+  matrix:
+    - LUA=lua5.1 LIBLUA=liblua5.1-dev     LUA_INCDIR=/usr/include/lua5.1     LUA_LIB=lua5.1
+    - LUA=lua5.2 LIBLUA=liblua5.2-dev     LUA_INCDIR=/usr/include/lua5.2     LUA_LIB=lua5.2
+    - LUA=luajit LIBLUA=libluajit-5.1-dev LUA_INCDIR=/usr/include/luajit-2.0 LUA_LIB=luajit-5.1
 
-script: mkdir build && cd build && cmake .. && make
+branches:
+  only:
+    - master
 
+compiler:
+  - gcc
+
+before_install:
+  - if [ $LUA = "luajit" ]; then
+      sudo add-apt-repository ppa:mwild1/ppa -y && sudo apt-get update -y;
+    fi
+
+install:
+  - sudo apt-get install libzmq3-dev -y
+  - sudo apt-get install $LUA -y
+  - sudo apt-get install $LIBLUA -y
+  - LUA_LIBDIR=`pkg-config $LUA --variable=libdir`
+  - INSTALL_LMOD=`pkg-config $LUA --variable=INSTALL_LMOD`
+  - INSTALL_CMOD=`pkg-config $LUA --variable=INSTALL_CMOD`
+  ## make sure there is a 'lua' command.
+  - if [ ! -x /usr/bin/lua ]; then
+      sudo ln -s `which $LUA` /usr/bin/lua;
+    fi
+  ## install lua-llthreads
+  - git clone git://github.com/Neopallium/lua-llthreads.git
+  - cd lua-llthreads ; mkdir build ; cd build
+  - cmake .. -DLUA_LIBRARIES=$LUA_LIBDIR -DLUA_INCLUDE_DIR=$LUA_INCDIR
+      -DINSTALL_LMOD=$INSTALL_LMOD -DINSTALL_CMOD=$INSTALL_CMOD
+  - make
+  - sudo make install
+  - cd ../..
+
+script:
+  #### build using pre-generated bindings.
+  - mkdir build; cd build
+  - cmake .. -DLUA_LIBRARIES=$LUA_LIBDIR -DLUA_INCLUDE_DIR=$LUA_INCDIR
+      -DINSTALL_LMOD=$INSTALL_LMOD -DINSTALL_CMOD=$INSTALL_CMOD
+  - make
+  - sudo make install
+  # Run tests.
+  - $LUA ../tests/test_inproc.lua
+  - $LUA ../perf/thread_lat.lua 1 1000
+  - cd .. ; rm -rf build
+  #### Re-Generate bindings.
+  - git clone git://github.com/Neopallium/LuaNativeObjects.git;
+  - mkdir build; cd build
+  - cmake .. -DLUA_LIBRARIES=$LUA_LIBDIR -DLUA_INCLUDE_DIR=$LUA_INCDIR
+      -DLUA_NATIVE_OBJECTS_PATH=$TRAVIS_BUILD_DIR/LuaNativeObjects
+      -DUSE_PRE_GENERATED_BINDINGS=OFF -DGENERATE_LUADOCS=OFF
+      -DINSTALL_LMOD=$INSTALL_LMOD -DINSTALL_CMOD=$INSTALL_CMOD
+  - make
+  - sudo make install
+  # Run tests.
+  - $LUA ../tests/test_inproc.lua
+  - $LUA ../perf/thread_lat.lua 1 1000
+
+notifications:
+  email:
+    on_failure: always
+    on_success: change
diff --git a/scripts/travis_build.sh b/scripts/travis_build.sh
deleted file mode 100755
index a577f17..0000000
--- a/scripts/travis_build.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#### build using pre-generated bindings.
-make
-sudo make install
-# Run tests.
-$LUA ../tests/test_inproc.lua
-$LUA ../perf/thread_lat.lua 1 1000
-cd .. ; rm -rf build
-#### Re-Generate bindings.
-git clone git://github.com/Neopallium/LuaNativeObjects.git;
-mkdir build; cd build
-cmake .. -DLUA_LIBRARIES=$LUA_LIBDIR -DLUA_INCLUDE_DIR=$LUA_INCDIR
-  -DLUA_NATIVE_OBJECTS_PATH=$TRAVIS_BUILD_DIR/LuaNativeObjects
-  -DUSE_PRE_GENERATED_BINDINGS=OFF -DGENERATE_LUADOCS=OFF
-  -DINSTALL_LMOD=$INSTALL_LMOD -DINSTALL_CMOD=$INSTALL_CMOD
-make
-sudo make install
-# Run tests.
-$LUA ../tests/test_inproc.lua
-$LUA ../perf/thread_lat.lua 1 1000
-
diff --git a/scripts/travis_install.sh b/scripts/travis_install.sh
deleted file mode 100755
index 6d3f210..0000000
--- a/scripts/travis_install.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-#
-sudo apt-get install libzmq3-dev -y
-sudo apt-get install $LUA -y
-sudo apt-get install $LIBLUA -y
-LUA_LIBDIR=`pkg-config $LUA --variable=libdir`
-INSTALL_LMOD=`pkg-config $LUA --variable=INSTALL_LMOD`
-INSTALL_CMOD=`pkg-config $LUA --variable=INSTALL_CMOD`
-## make sure there is a 'lua' command.
-if [ ! -x /usr/bin/lua ]; then
-  sudo ln -s `which $LUA` /usr/bin/lua;
-fi
-## install lua-llthreads
-git clone git://github.com/Neopallium/lua-llthreads.git
-cd lua-llthreads ; mkdir build ; cd build
-cmake .. -DLUA_LIBRARIES=$LUA_LIBDIR -DLUA_INCLUDE_DIR=$LUA_INCDIR
-  -DINSTALL_LMOD=$INSTALL_LMOD -DINSTALL_CMOD=$INSTALL_CMOD
-make
-sudo make install
-cd ../..
-
-