From 3b3d24c7d6f0b7f2aff090c13f46b20b0aeae76c Mon Sep 17 00:00:00 2001 From: Andre Rummler Date: Tue, 14 Jun 2016 17:34:44 +0200 Subject: [PATCH] Travis CI: Readding depfet to travis after Simon's fix --- .travis.yml | 7 +++++-- .travis/before_install.sh | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ea55271b63..c10097e936 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,10 +17,13 @@ env: - ROOT6_FILENAME_LINUX=root_v6.06.04.Linux-ubuntu14-x86_64-gcc4.8.tar.gz - ROOT6_FILENAME_MAC=root_v6.06.04.macosx64-10.9-clang60.tar.gz - - CMAKE_DOWNLOAD_PATH=https://cmake.org/files/v3.5/ + - CMAKE_DOWNLOAD_PATH=https://cmake.org/files/v3.5 - CMAKE_FILENAME_LINUX=cmake-3.5.2-Linux-x86_64.tar.gz - CMAKE_FILENAME_MAC=cmake-3.5.2-Darwin-x86_64.tar.gz + - OPENAFS_DOWNLOAD_PATH_MAC=http://www.openafs.org/dl/openafs/1.6.6/macos-10.9 + - OPENAFS_FILENAME_MAC=OpenAFS-1.6.6-Mavericks.dmg + # possible options: # Linux/Mac # gcc/clang @@ -76,6 +79,6 @@ before_script: - cd build script: - - cmake -DBUILD_onlinemon=ON -DBUILD_eudrb=ON -DBUILD_explorer=ON -DBUILD_fortis=ON -DBUILD_mimoroma=ON -DBUILD_mimosa32=ON -DBUILD_ni=ON -DBUILD_tlu=ON .. + - cmake -DBUILD_onlinemon=ON -DBUILD_eudrb=ON -DBUILD_explorer=ON -DBUILD_depfet=ON -DBUILD_fortis=ON -DBUILD_mimoroma=ON -DBUILD_mimosa32=ON -DBUILD_ni=ON -DBUILD_tlu=ON .. - make install diff --git a/.travis/before_install.sh b/.travis/before_install.sh index 93bb0d30aa..6da1f0c5b9 100755 --- a/.travis/before_install.sh +++ b/.travis/before_install.sh @@ -28,6 +28,12 @@ if [[ $TRAVIS_OS_NAME == 'osx' ]]; then if [[ "$CC" == "gcc" ]]; then CC=gcc-4.9; fi + echo "Installing openafs now" + wget ${OPENAFS_DOWNLOAD_PATH_MAC}/$OPENAFS_FILENAME_MAC + #tar xfz $OPENAFS_FILENAME_MAC + #export PATH="`pwd`/${CMAKE_FILENAME%%.tar.gz}/CMake.app/Contents/bin":$PATH: + #echo $PATH + else if [[ $OPTION == 'modern' ]]; then export ROOT_FILENAME=${ROOT6_FILENAME_LINUX}