WIP: Fix Travis-CI builds (#193)

Summary:
These changes fix Travis-CI builds on macOS and partially on Linux.

The only thing left to do on Linux is #192

This pull request also requires #188

Pull Request resolved: #193

Reviewed By: claudiozz

Differential Revision: D24933398

Pulled By: davide125

fbshipit-source-id: eb96db30a3cb71695111a7d41ca2c27fbe891d87

Author: hjmallon

.travis.yml

@@ -6,7 +6,11 @@ os:
   - linux
   - osx
 
-osx_image: xcode8.3
+# Need >= xcode9 to build folly
+osx_image: xcode9.4
+
+# Need >= gcc 5 to build folly
+dist: xenial
 
 compiler:
   - clang
@@ -16,15 +20,10 @@ addons:
   apt:
     sources:
       - boost-latest
-      - ubuntu-toolchain-r-test
-      - llvm-toolchain-precise-3.6
     packages:
-      - g++-4.9
-      - clang-3.6
-      - libboost-system1.55-dev
-      - libboost-filesystem1.55-dev
-#      - libssl-dev
-#      - openssl-1.0.1f
+      - libboost-system-dev
+      - libboost-filesystem-dev
+      - libssl-dev
 
 script:
   # Debug

build/travis_linux.sh

@@ -10,37 +10,17 @@ echo $HOSTNAME
 mkdir $HOME/bin || true
 export PATH=$HOME/bin:$PATH
 export LD_LIBRARY_PATH=$HOME/lib:$LD_LIBRARY_PATH
+export CMAKE_PREFIX_PATH=$HOME
 openssl version
-if [[ "$CXX" == "clang++" ]] ; then
-  export CC=clang-3.6
-  export CXX=clang++-3.6
-else
-  ln -s /usr/bin/g++-4.9 $HOME/bin/g++
-  ln -s /usr/bin/gcc-4.9 $HOME/bin/gcc
-fi
 cd ..
-# remove the dangerous no-check-certificate when travis is fixed...
-# https://github.com/travis-ci/travis-ci/issues/5059
-wget --no-check-certificate https://cmake.org/files/v3.3/cmake-3.3.2-Linux-x86_64.sh
-sh cmake-3.3.2-Linux-x86_64.sh --prefix=$HOME --skip-license
-OPENSSL_VERSION=openssl-1.0.1q
-wget https://www.openssl.org/source/$OPENSSL_VERSION.tar.gz
-tar xfz $OPENSSL_VERSION.tar.gz
-ls -l $HOME/bin
-( cd $OPENSSL_VERSION ; ./config --prefix=$HOME threads shared; make; make install )
-which openssl
-$HOME/bin/openssl version
-ldd $HOME/bin/openssl
-export OPENSSL_ROOT_DIR=$HOME
-git clone https://github.com/floitsch/double-conversion.git
-(cd double-conversion; cmake -DBUILD_SHARED_LIBS=on -DCMAKE_INSTALL_PREFIX=$HOME .; make -j 4 && make install)
-git clone https://github.com/schuhschuh/gflags.git
-(mkdir gflags/build; cd gflags/build; cmake -DCMAKE_INSTALL_PREFIX=$HOME -DGFLAGS_NAMESPACE=google -DBUILD_SHARED_LIBS=on .. && make -j 4 && make install)
+git clone https://github.com/google/double-conversion.git
+(mkdir double-conversion-build; cd double-conversion-build; cmake -DBUILD_SHARED_LIBS=on -DCMAKE_INSTALL_PREFIX=$HOME ../double-conversion; make -j 4 && make install)
+git clone https://github.com/gflags/gflags.git
+(mkdir gflags-build; cd gflags-build; cmake -DCMAKE_INSTALL_PREFIX=$HOME -DGFLAGS_NAMESPACE=google -DBUILD_SHARED_LIBS=on ../gflags && make -j 4 && make install)
 git clone https://github.com/google/glog.git
-(mkdir glog/build; cd glog/build; cmake -DINCLUDE_DIRECTORIES=$HOME/include -DCMAKE_INSTALL_PREFIX=$HOME -DBUILD_SHARED_LIBS=on .. && make -j 4 && make install)
+( cd glog && ./autogen.sh && ./configure --with-gflags=$HOME --prefix=$HOME && make -j 4 && make install )
 git clone https://github.com/facebook/folly.git
 pwd ; ls -l
 cd wdt
-
 #set +e
 set +x

build/travis_osx.sh

@@ -9,23 +9,15 @@ echo $HOSTNAME
 mkdir $HOME/bin || true
 brew update
 brew install openssl || true
-brew link --force openssl || true
-CMAKE_BASE=cmake-3.6.1-Darwin-x86_64
 cd ..
-CMAKE_BIN_DIR=`pwd`/$CMAKE_BASE/CMake.app/Contents/bin
-export PATH=/usr/local/opt/openssl/bin:$CMAKE_BIN_DIR:$HOME/bin:$PATH
+export PATH=/usr/local/opt/openssl/bin:$HOME/bin:$PATH
 export LD_LIBRARY_PATH=/usr/local/opt/openssl/lib:$HOME/lib:$LD_LIBRARY_PATH
 export OPENSSL_ROOT_DIR=/usr/local/opt/openssl
 export CMAKE_PREFIX_PATH=$HOME
 openssl version -a
-wget https://www.cmake.org/files/v3.6/$CMAKE_BASE.tar.gz
-tar xfz $CMAKE_BASE.tar.gz
-which cmake
-cmake --version
-git clone https://github.com/floitsch/double-conversion.git
-mkdir double-conversion-build
-(cd double-conversion-build; cmake -DBUILD_SHARED_LIBS=on -DCMAKE_INSTALL_PREFIX=$HOME ../double-conversion; make -j 4 && make install)
-git clone https://github.com/schuhschuh/gflags.git
+git clone https://github.com/google/double-conversion.git
+(mkdir double-conversion-build; cd double-conversion-build; cmake -DBUILD_SHARED_LIBS=on -DCMAKE_INSTALL_PREFIX=$HOME ../double-conversion; make -j 4 && make install)
+git clone https://github.com/gflags/gflags.git
 (mkdir gflags-build; cd gflags-build; cmake -DCMAKE_INSTALL_PREFIX=$HOME -DGFLAGS_NAMESPACE=google -DBUILD_SHARED_LIBS=on ../gflags && make -j 4 && make install)
 git clone https://github.com/google/glog.git
 ( cd glog && ./autogen.sh && ./configure --with-gflags=$HOME --prefix=$HOME && make -j 4 && make install )