Permalink
Browse files

Begin using build matrix to compile with both clang and gcc

Slightly less verbose method of building BUILDOPTS
USE_QUIET=0 for more info on errors
Don't test twice, just test after installation
Once installed, move entire git repo directory to avoid accidental linkage between build prefix and install prefix
  • Loading branch information...
1 parent fa84a4a commit 1f9d0a9112893d972502e6fa15b8a8e6cb4b55fa @staticfloat staticfloat committed Nov 26, 2012
Showing with 9 additions and 8 deletions.
  1. +9 −8 .travis.yml
View
@@ -1,18 +1,19 @@
language: cpp
-compiler: clang
+compiler:
+ - clang
+ - gcc
notifications:
email: false
before_install:
+ - BUILDOPTS="LLVM_CONFIG=llvm-config-3.1 USE_QUIET=0"; for lib in LLVM ZLIB SUITESPARSE ARPACK BLAS FFTW LAPACK LIGHTTPD GMP PCRE LIBUNWIND READLINE GLPK; do export BUILDOPTS="$BUILDOPTS USE_SYSTEM_$lib=1"; done
- sudo apt-get update -qq -y
- sudo apt-get install zlib1g-dev
- sudo add-apt-repository ppa:staticfloat/julia-deps -y
- sudo apt-get update -qq -y
- - sudo apt-get install gfortran clang llvm-3.1-dev libsuitesparse-dev libncurses5-dev libopenblas-dev libarpack2-dev libfftw3-dev libpcre3-dev libglpk-dev lighttpd libgmp-dev libunwind7-dev libreadline-dev -y
-env:
- - BUILDOPTS="LLVM_CONFIG=llvm-config-3.1 USECLANG=1 USE_SYSTEM_LLVM=1 USE_SYSTEM_ZLIB=1 USE_SYSTEM_SUITESPARSE=1 USE_SYSTEM_ARPACK=1 USE_SYSTEM_BLAS=1 USE_SYSTEM_FFTW=1 USE_SYSTEM_LAPACK=1 USE_SYSTEM_LIGHTTPD=1 USE_SYSTEM_GMP=1 USE_SYSTEM_PCRE=1 USE_SYSTEM_LIBUNWIND=1 USE_SYSTEM_READLINE=1 USE_SYSTEM_GLPK=1"
-script: make $BUILDOPTS dist
+ - sudo apt-get install gfortran llvm-3.1-dev libsuitesparse-dev libncurses5-dev libopenblas-dev libarpack2-dev libfftw3-dev libpcre3-dev libglpk-dev lighttpd libgmp-dev libunwind7-dev libreadline-dev -y
+script: make $BUILDOPTS PREFIX=/tmp/julia install
after_script:
- - make $BUILDOPTS testall
- - make $BUILDOPTS PREFIX=/tmp/julia install
+ - cd .. && mv julia julia2
- cd /tmp/julia/share/julia/test && /tmp/julia/bin/julia runtests.jl all
- - echo "Packaging steps here"
+ - cd - && mv julia2 julia
+ - echo "Ready for packaging..."

0 comments on commit 1f9d0a9

Please sign in to comment.