From a8810dc2640270da9976dc87c03fc69f50ff06ec Mon Sep 17 00:00:00 2001
From: Marko Petric <marko.petric@cern.ch>
Date: Wed, 14 Feb 2018 14:33:30 +0100
Subject: [PATCH] Update ROOT in CI
---
.dd4hep-ci.d/init_mac.sh | 106 ------------------------------------
.dd4hep-ci.d/init_x86_64.sh | 2 +-
2 files changed, 1 insertion(+), 107 deletions(-)
delete mode 100644 .dd4hep-ci.d/init_mac.sh
diff --git a/.dd4hep-ci.d/init_mac.sh b/.dd4hep-ci.d/init_mac.sh
deleted file mode 100644
index 67a1fc581..000000000
--- a/.dd4hep-ci.d/init_mac.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/bash
-
-#Determine which OS you are using
-if [ "$(uname)" == "Darwin" ]; then
-if [ $(sw_vers -productVersion | awk -F '.' '{print $1 "." $2}') == "10.13" ]; then
-OS=mac1013
-COMPILER_TYPE=llvm
-COMPILER_VERSION=llvm90
-else
-echo "Bootstrap only works on macOS High Sierra (10.13)"
-fi
-elif [ "$(uname)" == "Linux" ]; then
-if [ "$( cat /etc/*-release | grep Scientific )" ]; then
-OS=slc6
-elif [ "$( cat /etc/*-release | grep CentOS )" ]; then
-OS=centos7
-fi
-else
-echo "UNKNOWN OS"
-exit 1
-fi
-
-#Determine is you have CVMFS installed
-if [ ! -d "/cvmfs" ]; then
-echo "No CVMFS detected, please install it."
-exit 1
-fi
-
-if [ ! -d "/cvmfs/clicdp.cern.ch" ]; then
-echo "No clicdp CVMFS repository detected, please add it."
-exit 1
-fi
-
-#Choose build type
-if [ -z ${BUILD_TYPE} ]; then
-BUILD_TYPE=opt
-fi
-
-# General variables
-CLICREPO=/cvmfs/clicdp.cern.ch
-BUILD_FLAVOUR=x86_64-${OS}-${COMPILER_VERSION}-${BUILD_TYPE}
-
-#--------------------------------------------------------------------------------
-# CMake
-#--------------------------------------------------------------------------------
-
-export CMAKE_HOME=${CLICREPO}/software/CMake/3.9.5/${BUILD_FLAVOUR}
-export PATH=${CMAKE_HOME}/bin:$PATH
-
-#--------------------------------------------------------------------------------
-# Python
-#--------------------------------------------------------------------------------
-
-export PYTHONDIR=${CLICREPO}/software/Python/2.7.14/${BUILD_FLAVOUR}
-export PATH=${PYTHONDIR}/bin:$PATH
-export LD_LIBRARY_PATH=${PYTHONDIR}/lib:${LD_LIBRARY_PATH}
-
-#--------------------------------------------------------------------------------
-# ROOT
-#--------------------------------------------------------------------------------
-
-export ROOTSYS=${CLICREPO}/software/ROOT/6.10.08/${BUILD_FLAVOUR}
-export PYTHONPATH="$ROOTSYS/lib:$PYTHONPATH"
-export PATH="$ROOTSYS/bin:$PATH"
-export LD_LIBRARY_PATH="$ROOTSYS/lib:$LD_LIBRARY_PATH"
-
-#--------------------------------------------------------------------------------
-# XercesC
-#--------------------------------------------------------------------------------
-
-export XercesC_HOME=${CLICREPO}/software/Xerces-C/3.2.0/${BUILD_FLAVOUR}
-export PATH="$XercesC_HOME/bin:$PATH"
-export LD_LIBRARY_PATH="$XercesC_HOME/lib:$LD_LIBRARY_PATH"
-
-
-#--------------------------------------------------------------------------------
-# Geant4
-#--------------------------------------------------------------------------------
-
-export G4INSTALL=${CLICREPO}/software/Geant4/10.03.p03/${BUILD_FLAVOUR}
-export G4ENV_INIT="${G4INSTALL}/bin/geant4.sh"
-export G4SYSTEM="Linux-g++"
-
-
-#--------------------------------------------------------------------------------
-# LCIO
-#--------------------------------------------------------------------------------
-export LCIO=${CLICREPO}/software/LCIO/2.11.0/${BUILD_FLAVOUR}
-export PYTHONPATH=${LCIO}/python
-export PATH=${LCIO}/bin:$PATH
-export LD_LIBRARY_PATH="$LCIO/lib:$LD_LIBRARY_PATH"
-
-
-#--------------------------------------------------------------------------------
-# Boost
-#--------------------------------------------------------------------------------
-
-export BOOST_ROOT=${CLICREPO}/software/Boost/1.65.1/${BUILD_FLAVOUR}
-export LD_LIBRARY_PATH="${BOOST_ROOT}/lib:$LD_LIBRARY_PATH"
-
-#--------------------------------------------------------------------------------
-# Ninja
-#--------------------------------------------------------------------------------
-
-export Ninja_HOME=${CLICREPO}/software/Ninja/1.8.2/${BUILD_FLAVOUR}
-export PATH="$Ninja_HOME:$PATH"
diff --git a/.dd4hep-ci.d/init_x86_64.sh b/.dd4hep-ci.d/init_x86_64.sh
index efa91c6ce..81a8a7c14 100644
--- a/.dd4hep-ci.d/init_x86_64.sh
+++ b/.dd4hep-ci.d/init_x86_64.sh
@@ -84,7 +84,7 @@ export LD_LIBRARY_PATH=${PYTHONDIR}/lib:${LD_LIBRARY_PATH}
# ROOT
#--------------------------------------------------------------------------------
-export ROOTSYS=${CLICREPO}/software/ROOT/6.12.04/${BUILD_FLAVOUR}
+export ROOTSYS=${CLICREPO}/software/ROOT/6.12.06/${BUILD_FLAVOUR}
export PYTHONPATH="$ROOTSYS/lib:$PYTHONPATH"
export PATH="$ROOTSYS/bin:$PATH"
export LD_LIBRARY_PATH="$ROOTSYS/lib:$LD_LIBRARY_PATH"
--
GitLab