From 6635058e8be97721447ec8e202306226fa8187ca Mon Sep 17 00:00:00 2001
From: Roger Meier <roger@apache.org>
Date: Wed, 15 Jan 2014 09:51:48 +0100
Subject: [PATCH] THRIFT-2312 .travis.yml: enable ruby, php and mingw compiler
 build

---
 .travis.yml | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c2d1b6f6..4f8115e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,9 @@
 
 # build Apache Thrift on Travis CI - https://travis-ci.org/
 
-language: cpp
+language: ruby
+rvm:
+  - 1.9.3
 
 # see what we need: http://thrift.apache.org/docs/install/ubuntu
 before_install:
@@ -28,18 +30,23 @@ before_install:
  - sudo DEBIAN_FRONTEND=noninteractive apt-get -qq -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" upgrade
  - sudo apt-get install -qq libboost-dev libboost-test-dev libboost-program-options-dev libevent-dev automake libtool flex bison pkg-config g++ libssl-dev 
 # Java
- - sudo apt-get install -qq libcommons-lang3-java ant
-# TODO: fix ruby support
+ - sudo apt-get install -qq ant
 # Ruby
-# - sudo apt-get install -qq ruby1.9.1-full ruby1.9.1-dev ruby-rspec rake rubygems libdaemons-ruby libgemplugin-ruby mongrel
-# - sudo /usr/bin/gem1.9.1 install bundler
-# - sudo /usr/bin/gem1.9.1 install rack-test
+ - gem uninstall bundler -I -x
+ - gem install bundler -v 1.3.5
 # Python
  - sudo apt-get install -qq python-all python-all-dev python-all-dbg
 # Perl
  - sudo apt-get install -qq libbit-vector-perl
 # PHP
  - sudo apt-get install -qq php5-dev php5-cli phpunit
+ - sudo apt-get upgrade pear
+ - sudo pear channel-discover pear.phpunit.de
+ - sudo pear channel-discover pear.symfony.com
+ - sudo pear channel-discover components.ez.no
+ - sudo pear update-channels
+ - sudo pear upgrade-all
+ - sudo pear install --alldeps phpunit/PHPUnit
 # c_glib
  - sudo apt-get install -qq libglib2.0-dev
 # Erlang
@@ -56,18 +63,14 @@ before_install:
 # TODO: move npm install to nodejs Makefile
  - cd lib/nodejs; npm install & cd ../..
 
-
 install:
   - sh bootstrap.sh
 
 script:
-# TODO: fix ruby support
-#  - export PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games:/var/lib/gems/1.9.1/bin
-#  - sh configure RUBY=/usr/bin/ruby1.9.1 RAKE=/usr/bin/rake1.9.1
 # TODO: fix these languages
-  - sh configure --without-ruby --without-haskell --without-perl --without-php  --without-python
+  - sh configure --without-erlang --without-haskell --without-perl --without-python
   - make -j$NUM_CPU && make dist
   - make check -j$NUM_CPU && sh test/test.sh
+  - sh bootstrap.sh ; sh contrib/mingw-cross-compile.sh
 # TODO: add these steps
-#  - sh bootstrap.sh ; sh contrib/mingw-cross-compile.sh
 #  - sh bootstrap.sh ; dpkg-buildpackage -tc
-- 
2.17.1