THRIFT-2471 requires libboost 1.54

+ additional script clean up

diff --git a/.travis.yml b/.travis.yml
index 2ae6fcb..9bd9dfa 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,14 +28,13 @@ cache:
 
 # see what we need: http://thrift.apache.org/docs/install/ubuntu
 before_install:
- - export NUM_CPU="`grep processor /proc/cpuinfo | wc -l`"; echo $NUM_CPU
+ - sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu/ trusty main restricted" -y
  - sudo apt-get update -qq
-# - 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 bc 
+ - dpkg -S /usr/include/boost/version.hpp
 # Java
  - sudo apt-get install -qq ant
 # Ruby
-# - gem uninstall bundler -I -x
  - gem install bundler -v 1.3.5 || true
 # Python
 # - sudo apt-get install -qq python-all python-all-dev python-all-dbg
@@ -58,7 +57,7 @@ before_install:
 # Haskell
 # - sudo apt-get install -qq ghc6 cabal-install libghc6-binary-dev libghc6-network-dev libghc6-http-dev
 # Thrift Compiler for Windows
- - sudo apt-get install -qq mingw32 mingw32-binutils mingw32-runtime
+ - sudo apt-get install -qq mingw32
 # node.js
  - sudo apt-get install -qq nodejs npm
  - sudo npm install nodeunit -g || true
@@ -69,8 +68,8 @@ install:
 script:
 # TODO: fix these languages
   - sh configure --without-erlang --without-haskell --without-python --without-go --without-lua
-  - make -j$NUM_CPU && make dist
-  - make cross -j$NUM_CPU
+  - make -j2 && make dist
+  - make cross -j2
   - sh bootstrap.sh ; sh contrib/mingw-cross-compile.sh
 # TODO: add these steps
 #  - sh bootstrap.sh ; dpkg-buildpackage -tc

diff --git a/configure.ac b/configure.ac
index 5941cd8..e20dc64 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -127,7 +127,7 @@ fi
 AX_THRIFT_LIB(cpp, [C++], yes)
 have_cpp=no
 if test "$with_cpp" = "yes";  then
-  AX_BOOST_BASE([1.53.0])
+  AX_BOOST_BASE([1.54.0])
   if test "x$succeeded" = "xyes" ; then
     have_cpp="yes"
   fi

diff --git a/doc/install/README.md b/doc/install/README.md
index 83798af..75e4127 100644 (file)
--- a/doc/install/README.md
+++ b/doc/install/README.md
@@ -3,7 +3,7 @@
 * A relatively POSIX-compliant *NIX system
     * Cygwin or MinGW can be used on Windows
 * g++ 4.2
-* boost 1.53.0
+* boost 1.54.0
 * Runtime libraries for lex and yacc might be needed for the compiler.
 
 ## Requirements for building from source