Skip to content

Commit

Permalink
Travis CI: Readding depfet to travis after Simon's fix
Browse files Browse the repository at this point in the history
  • Loading branch information
arummler committed Aug 18, 2016
1 parent a16e29e commit 3b3d24c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
7 changes: 5 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

6 changes: 6 additions & 0 deletions .travis/before_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down

0 comments on commit 3b3d24c

Please sign in to comment.