From 2a5cd3bd49bae4af04937b261cf09092bce0a2f2 Mon Sep 17 00:00:00 2001
From: ThePhD <phdofthehouse@gmail.com>
Date: Wed, 24 Feb 2016 22:29:15 -0500
Subject: [PATCH] Dependency reduction: just want to test compilers, and we
 don't explicitly install on the user's machine using shell scripts (configure
 bootstrap.py to be more flexible instead for that). Only other possible test
 cases are 2 more for luajit-latest (2.0.4).

---
 .travis.yml     | 112 +++++++-----------------------------------------
 install.deps.sh |  82 -----------------------------------
 2 files changed, 16 insertions(+), 178 deletions(-)
 delete mode 100644 install.deps.sh

diff --git a/.travis.yml b/.travis.yml
index a5179346..fe0ac4d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,124 +3,44 @@ language: cpp
 git:
     depth: 5
 
+branches:
+  only:
+    - master
+    - develop
+ 	
 matrix:
   include: 
     - os: linux
-      env: COMPILER=g++-4.9 LUA=lua52
+      env: COMPILER=g++-4.8 LUA=lua52
       compiler: gcc
       addons:
         apt:
           sources:
           - ubuntu-toolchain-r-test 
           packages:
-          - gcc-4.9
-          - g++-4.9  
+          - gcc-4.8
+          - g++-4.8  
           - ninja-build
-          - liblua5.2-dev
-
-    # gcc-5
+          - liblua5.3-dev
+    
     - os: linux
-      env: COMPILER=g++-4.9 LUA=luajit
-      compiler: gcc
-      addons:
-        apt:
-          sources:
-          - ubuntu-toolchain-r-test 
-          packages:
-          - gcc-4.9
-          - g++-4.9
-          - ninja-build  
-          - libluajit-5.1-dev 
-
-    # gcc-5
-    - os: linux
-      env: COMPILER=g++-5 LUA=lua52
-      compiler: gcc
-      addons:
-        apt:
-          sources:
-          - ubuntu-toolchain-r-test 
-          packages:
-          - gcc-5
-          - g++-5
-          - ninja-build  
-          - liblua5.2-dev  
-
-    # gcc-5
-    - os: linux
-      env: COMPILER=g++-5 LUA=luajit
-      compiler: gcc
-      addons:
-        apt:
-          sources:
-          - ubuntu-toolchain-r-test 
-          packages:
-          - gcc-5
-          - g++-5
-          - ninja-build  
-          - libluajit-5.1-dev  
-
-    - os: linux
-      env: COMPILER=clang++-3.6 lua=lua52
+      env: COMPILER=clang++-3.4 LUA=lua53
       compiler: clang
       addons:
         apt:
           sources:
           - ubuntu-toolchain-r-test 
-          - llvm-toolchain-precise-3.6
           packages:
-          - clang-3.6
-          - ninja-build   
-          - liblua5.2-dev  
-
-    - os: linux
-      env: COMPILER=clang++-3.6 lua=luajit
-      compiler: clang
-      addons:
-        apt:
-          sources:
-          - ubuntu-toolchain-r-test 
-          - llvm-toolchain-precise-3.6
-          packages:
-          - clang-3.6
-          - ninja-build   
-          - libluajit-5.1-dev  
-
-    # Mac OSX
-    - os: osx
-      osx_image: xcode7
-      compiler: clang
-      env: COMPILER=appleclang 
-
-    - os: osx
-      osx_image: xcode6
-      compiler: clang
-      env: COMPILER=appleclang 
-
-    # Test using gcc
-    - os: osx
-      osx_image: xcode7
-      compiler: gcc
-      env: COMPILER=g++-4.9 
-
-    - os: osx
-      compiler: gcc
-      env: COMPILER=g++-5
+          - clang++-3.4
+          - ninja-build
+          - liblua5.3-dev
 
 before_install:
-- source ./install.deps.sh
-
-install:
-- install_os_deps
+	- sudo apt-get update -qq
+	- sudo apt-get install -qq 
 
 script:
 - echo "Configuration info:"
 - export_compiler_vars
 - ninja --version
 - ./bootstrap.py --ci && ninja
-
-notifications:
-    email:
-        on_success: change
-        on_failure: change
-
diff --git a/install.deps.sh b/install.deps.sh
deleted file mode 100644
index 6858a3b6..00000000
--- a/install.deps.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env bash
-
-# This script installs and configures the dependencies for the project
-
-case `uname` in 
-    Darwin)     export OS_NAME="osx"    ;;
-    Linux)      export OS_NAME="linux"  ;;
-esac
-
-echo "Building on: ${OS_NAME}"
-
-if env | grep -qE '^(?:TRAVIS|CI)='; then
-#    We're on Travis, intialize variables:
-    echo "Detected CI Build -> CI=${CI}"
-else
-#   We're building locally
-    export CI=false
-    echo "Detected Local Build -> CI=${CI}"
-fi
-
-export_compiler_vars() {
-    case ${COMPILER} in
-        appleclang*) 
-            export CC=clang
-            export CXX=clang++
-        ;;
-
-        clang*)
-            export CC=$(echo ${COMPILER} | sed 's/\+//g')
-            export CXX=${COMPILER}
-        ;;
-
-        g++-*)
-            export CC=$(echo ${COMPILER} | sed 's/\+/c/g')
-            export CXX=${COMPILER} 
-        ;;
-
-        *) echo "Invalid compiler version" ; exit 2 ;;
-    esac
-
-    echo "CC=${CC}"
-    $CC --version
-
-    echo "CXX=${CXX}"
-    $CXX --version
-}
-
-install_os_deps() {
-    # Install all of the OS specific OS dependencies
-    echo "Install: os-based dependencies"
-
-    local wd=`pwd`
-
-    case ${OS_NAME} in
-        osx)
-            export HOMEBREW_NO_EMOJI=1
-
-            echo "brew update ..."; brew update > /dev/null
-
-            case ${COMPILER} in
-                appleclang*) ;;
-
-                g++-5)
-                    brew install gcc5 
-                    brew link gcc5 --overwrite --force
-                ;;
-
-                g++-4.9) ;;
-
-                *) echo "Invalid compiler version" ; exit 2 ;;
-            esac
-
-            brew install ninja lua
-        ;;
-
-        linux) 
-            # no extras currently
-        ;;
-    esac
-
-    cd ${wd}
-}