From eb73d2f26979034aaf7b6b6dd0cd3b1dc3233a11 Mon Sep 17 00:00:00 2001
From: Antonin Portelli <antonin.portelli@me.com>
Date: Fri, 26 Apr 2019 17:36:44 +0100
Subject: [PATCH] CI scripts update

---
 .travis.yml                  | 5 +----
 ci-scripts/install-deps.sh   | 2 +-
 ci-scripts/install-gsl.sh    | 2 +-
 ci-scripts/install-hdf5.sh   | 2 +-
 ci-scripts/install-latan.sh  | 7 +++----
 ci-scripts/install-minuit.sh | 2 +-
 ci-scripts/install-nlopt.sh  | 2 +-
 7 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fd40040..35d0f5e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,6 @@ matrix:
             - ubuntu-toolchain-r-test
           packages:
             - g++-7
-            - libgsl0-dev
             - flex
             - bison
       env: VERSION=-7
@@ -32,7 +31,6 @@ matrix:
             - ubuntu-toolchain-r-test
           packages:
             - g++-7
-            - libgsl0-dev
             - flex
             - bison
       env: CLANG_LINK=http://releases.llvm.org/7.0.1/clang+llvm-7.0.1-x86_64-linux-gnu-ubuntu-14.04.tar.xz
@@ -44,7 +42,6 @@ before_install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CC" == "clang" ]]; then export PATH="${LATDIR}/ci-scripts/clang/bin:${PATH}"; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CC" == "clang" ]]; then export LD_LIBRARY_PATH="${LATDIR}/ci-scripts/clang/lib:${LD_LIBRARY_PATH}"; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gsl; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install bison flex; export PATH="/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH"; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]]; then brew install gcc@${VERSION#-}; fi
   
@@ -63,4 +60,4 @@ install:
 
 script:
   - cd ci-scripts
-  - ./install-latan.sh `pwd`/local $TRAVIS_OS_NAME
+  - ./install-latan.sh `pwd`/local
diff --git a/ci-scripts/install-deps.sh b/ci-scripts/install-deps.sh
index c6b5bc7..6faf97b 100755
--- a/ci-scripts/install-deps.sh
+++ b/ci-scripts/install-deps.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 if (( $# != 1 )); then
-  echo "usage: `basename $0` <prefix> {osx|linux}" 1>&2
+  echo "usage: `basename $0` <prefix>" 1>&2
   exit 1
 fi
 PREFIX=$1
diff --git a/ci-scripts/install-gsl.sh b/ci-scripts/install-gsl.sh
index 1ed95c5..317a023 100755
--- a/ci-scripts/install-gsl.sh
+++ b/ci-scripts/install-gsl.sh
@@ -3,7 +3,7 @@
 NAME='gsl-2.5'
 
 if (( $# != 1 )); then
-  echo "usage: `basename $0` <prefix> {osx|linux}" 1>&2
+  echo "usage: `basename $0` <prefix>" 1>&2
   exit 1
 fi
 PREFIX=$1
diff --git a/ci-scripts/install-hdf5.sh b/ci-scripts/install-hdf5.sh
index 2a74388..ca2ee9e 100755
--- a/ci-scripts/install-hdf5.sh
+++ b/ci-scripts/install-hdf5.sh
@@ -3,7 +3,7 @@
 NAME='hdf5-1.10.1'
 
 if (( $# != 1 )); then
-  echo "usage: `basename $0` <prefix> {osx|linux}" 1>&2
+  echo "usage: `basename $0` <prefix>" 1>&2
   exit 1
 fi
 PREFIX=$1
diff --git a/ci-scripts/install-latan.sh b/ci-scripts/install-latan.sh
index e43e9a2..6e04c35 100755
--- a/ci-scripts/install-latan.sh
+++ b/ci-scripts/install-latan.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-if (( $# != 2 )); then
-  echo "usage: `basename $0` <prefix> {osx|linux}" 1>&2
+if (( $# != 1 )); then
+  echo "usage: `basename $0` <prefix>" 1>&2
   exit 1
 fi
 PREFIX=$1
@@ -13,7 +13,6 @@ cd ..
 ./bootstrap.sh
 mkdir -p build
 cd build
-if [[ "$OS" == "osx" ]]; then EXTRA_FLAGS='--with-gsl=/usr/local'; fi
-../configure --prefix=$PREFIX --with-minuit=$PREFIX --with-nlopt=$PREFIX --with-latcore=$PREFIX --with-hdf5=$PREFIX $EXTRA_FLAGS CXXFLAGS="${CXXFLAGS} -O3 -march=native -mtune=native"
+../configure --prefix=$PREFIX --with-minuit=$PREFIX --with-nlopt=$PREFIX --with-latcore=$PREFIX --with-hdf5=$PREFIX --with-gsl=$PREFIX CXXFLAGS="${CXXFLAGS} -O3 -march=native -mtune=native"
 make -j4
 make install
diff --git a/ci-scripts/install-minuit.sh b/ci-scripts/install-minuit.sh
index 233672e..eeafbda 100755
--- a/ci-scripts/install-minuit.sh
+++ b/ci-scripts/install-minuit.sh
@@ -3,7 +3,7 @@
 NAME='Minuit2-5.34.14'
 
 if (( $# != 1 )); then
-  echo "usage: `basename $0` <prefix> {osx|linux}" 1>&2
+  echo "usage: `basename $0` <prefix>" 1>&2
   exit 1
 fi
 PREFIX=$1
diff --git a/ci-scripts/install-nlopt.sh b/ci-scripts/install-nlopt.sh
index 1518dc6..ba8fe98 100755
--- a/ci-scripts/install-nlopt.sh
+++ b/ci-scripts/install-nlopt.sh
@@ -3,7 +3,7 @@
 NAME='nlopt-2.4.2'
 
 if (( $# != 1 )); then
-  echo "usage: `basename $0` <prefix> {osx|linux}" 1>&2
+  echo "usage: `basename $0` <prefix>" 1>&2
   exit 1
 fi
 PREFIX=$1