diff --git a/.gitlab-ci.d/init_x86_64-centos7-gcc48-opt.sh b/.gitlab-ci.d/init_x86_64-centos7-gcc48-opt.sh deleted file mode 100644 index 422def0e738c71b29de90b1dc50fbf8f93afd72e..0000000000000000000000000000000000000000 --- a/.gitlab-ci.d/init_x86_64-centos7-gcc48-opt.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash - -# General variables -export LCGRELEASES=/cvmfs/sft.cern.ch/lcg/releases/ - -#-------------------------------------------------------------------------------- -# GCC 4.8.4 -#-------------------------------------------------------------------------------- - -source $LCGRELEASES/gcc/4.8.4/x86_64-cc7/setup.sh - -#-------------------------------------------------------------------------------- -# CMake 3.4.1 -#-------------------------------------------------------------------------------- - -export CMAKE_HOME=$LCGRELEASES/CMake/3.4.1-811c2/x86_64-centos7-gcc49-opt -export PATH=${CMAKE_HOME}/bin:$PATH - -#-------------------------------------------------------------------------------- -# Python 2.7.9 -#-------------------------------------------------------------------------------- - -export PYTHONDIR=$LCGRELEASES/Python/2.7.9.p1-af54f/x86_64-centos7-gcc48-opt -export PATH=$PYTHONDIR/bin:$PATH -export LD_LIBRARY_PATH=$PYTHONDIR/lib:$LD_LIBRARY_PATH - -#-------------------------------------------------------------------------------- -# pytools 1.9 -#-------------------------------------------------------------------------------- - -export PYTOOLSDIR=$LCGRELEASES/pytools/1.9_python2.7-f55a5/x86_64-cc7-gcc48-opt -export PYTHONPATH=$PYTOOLSDIR/lib/python2.7/site-packages:$PYTHONPATH -export PATH=$PYTOOLSDIR/bin:$PATH - -#-------------------------------------------------------------------------------- -# CLHEP -#-------------------------------------------------------------------------------- - -export CLHEP=$LCGRELEASES/clhep/2.3.1.1-6ba0c/x86_64-centos7-gcc48-opt -export CLHEP_BASE_DIR="$CLHEP" -export CLHEP_INCLUDE_DIR="$CLHEP/include" -export PATH="$CLHEP_BASE_DIR/bin:$PATH" -export LD_LIBRARY_PATH="$CLHEP_BASE_DIR/lib:$LD_LIBRARY_PATH" - -#-------------------------------------------------------------------------------- -# ROOT -#-------------------------------------------------------------------------------- - -export ROOTSYS=$LCGRELEASES/ROOT/6.04.06-145b2/x86_64-cc7-gcc48-opt -export PYTHONPATH="$ROOTSYS/lib:$PYTHONPATH" -export PATH="$ROOTSYS/bin:$PATH" -export LD_LIBRARY_PATH="$ROOTSYS/lib:$LD_LIBRARY_PATH" - -#-------------------------------------------------------------------------------- -# LCIO -#-------------------------------------------------------------------------------- - -export LCIO="/afs/cern.ch/eng/clic/software/lcio/v02-08/x86_64-centos7-gcc48-opt" -export PYTHONPATH="$LCIO/src/python:$LCIO/examples/python:$PYTHONPATH" -export PATH="$LCIO/tools:$LCIO/bin:$PATH" -export LD_LIBRARY_PATH="$LCIO/lib:$LD_LIBRARY_PATH" - -#-------------------------------------------------------------------------------- -# Geant4 -#-------------------------------------------------------------------------------- - -export G4INSTALL=$LCGRELEASES/Geant4/10.01.p02-81fbd/x86_64-cc7-gcc48-opt/ -export G4ENV_INIT="$G4INSTALL/bin/geant4.sh" -export G4SYSTEM="Linux-g++" - -#-------------------------------------------------------------------------------- -# Boost -#-------------------------------------------------------------------------------- - -export BOOST_ROOT=$LCGRELEASES/Boost/1.59.0_python2.7-71952/x86_64-cc7-gcc48-opt/ - -#-------------------------------------------------------------------------------- -# XercesC -#-------------------------------------------------------------------------------- - -export XercesC_HOME=$LCGRELEASES/XercesC/3.1.1p1-8ccd5/x86_64-cc7-gcc48-opt/ -export PATH="$XercesC_HOME/bin:$PATH" -export LD_LIBRARY_PATH="$XercesC_HOME/lib:$LD_LIBRARY_PATH" - - - - - - - diff --git a/.gitlab-ci.d/init_x86_64-centos7-gcc49-opt.sh b/.gitlab-ci.d/init_x86_64-centos7-gcc49-opt.sh index 710a555c81aabfc7b92fb1f791e7dae5d1b7afb7..444325d0b65212204a76ebf00004504f63607895 100644 --- a/.gitlab-ci.d/init_x86_64-centos7-gcc49-opt.sh +++ b/.gitlab-ci.d/init_x86_64-centos7-gcc49-opt.sh @@ -1,26 +1,26 @@ #!/bin/bash # General variables -export LCGRELEASES=/cvmfs/sft.cern.ch/lcg/releases/ +export LCGRELEASES=/cvmfs/sft.cern.ch/lcg/releases/LCG_84 #-------------------------------------------------------------------------------- # GCC 4.9.3 #-------------------------------------------------------------------------------- -source $LCGRELEASES/gcc/4.9.3/x86_64-cc7/setup.sh +source $LCGRELEASES/gcc/4.9.3/x86_64-centos7/setup.sh #-------------------------------------------------------------------------------- # CMake 3.4.1 #-------------------------------------------------------------------------------- -export CMAKE_HOME=$LCGRELEASES/CMake/3.4.1-811c2/x86_64-centos7-gcc49-opt +export CMAKE_HOME=$LCGRELEASES/CMake/3.4.1/x86_64-centos7-gcc49-opt/ export PATH=${CMAKE_HOME}/bin:$PATH #-------------------------------------------------------------------------------- -# Python 2.7.9 +# Python 2.7.10 #-------------------------------------------------------------------------------- -export PYTHONDIR=$LCGRELEASES/Python/2.7.9.p1-af54f/x86_64-centos7-gcc49-opt +export PYTHONDIR=$LCGRELEASES/Python/2.7.10/x86_64-centos7-gcc49-opt/ export PATH=$PYTHONDIR/bin:$PATH export LD_LIBRARY_PATH=$PYTHONDIR/lib:$LD_LIBRARY_PATH @@ -28,7 +28,7 @@ export LD_LIBRARY_PATH=$PYTHONDIR/lib:$LD_LIBRARY_PATH # pytools 1.9 #-------------------------------------------------------------------------------- -export PYTOOLSDIR=$LCGRELEASES/pytools/1.9_python2.7-f55a5/x86_64-cc7-gcc49-opt +export PYTOOLSDIR=$LCGRELEASES/1.9_python2.7/x86_64-centos7-gcc49-opt/ export PYTHONPATH=$PYTOOLSDIR/lib/python2.7/site-packages:$PYTHONPATH export PATH=$PYTOOLSDIR/bin:$PATH @@ -36,7 +36,7 @@ export PATH=$PYTOOLSDIR/bin:$PATH # CLHEP #-------------------------------------------------------------------------------- -export CLHEP=$LCGRELEASES/clhep/2.3.1.1-6ba0c/x86_64-centos7-gcc49-opt +export CLHEP=$LCGRELEASES/clhep/2.3.1.1/x86_64-centos7-gcc49-opt/ export CLHEP_BASE_DIR="$CLHEP" export CLHEP_INCLUDE_DIR="$CLHEP/include" export PATH="$CLHEP_BASE_DIR/bin:$PATH" @@ -46,7 +46,7 @@ export LD_LIBRARY_PATH="$CLHEP_BASE_DIR/lib:$LD_LIBRARY_PATH" # ROOT #-------------------------------------------------------------------------------- -export ROOTSYS=$LCGRELEASES/ROOT/6.04.06-145b2/x86_64-cc7-gcc49-opt +export ROOTSYS=$LCGRELEASES/ROOT/6.06.02/x86_64-centos7-gcc49-opt/ export PYTHONPATH="$ROOTSYS/lib:$PYTHONPATH" export PATH="$ROOTSYS/bin:$PATH" export LD_LIBRARY_PATH="$ROOTSYS/lib:$LD_LIBRARY_PATH" @@ -64,24 +64,29 @@ export LD_LIBRARY_PATH="$LCIO/lib:$LD_LIBRARY_PATH" # Geant4 #-------------------------------------------------------------------------------- -export G4INSTALL=$LCGRELEASES/Geant4/10.01.p02-81fbd/x86_64-cc7-gcc49-opt/ +export G4INSTALL=$LCGRELEASES/Geant4/10.01.p02/x86_64-centos7-gcc49-opt/ export G4ENV_INIT="$G4INSTALL/bin/geant4.sh" export G4SYSTEM="Linux-g++" +#-------------------------------------------------------------------------------- +# QT +#-------------------------------------------------------------------------------- + +export QTDIR=$LCGRELEASES/qt/4.8.4/x86_64-centos7-gcc49-opt/ +export QMAKESPEC="$QTDIR/mkspecs/linux-g++" +export PATH="$QTDIR/bin:$PATH" +export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" + #-------------------------------------------------------------------------------- # Boost #-------------------------------------------------------------------------------- -export BOOST_ROOT=$LCGRELEASES/Boost/1.59.0_python2.7-71952/x86_64-cc7-gcc49-opt/ +export BOOST_ROOT=$LCGRELEASES/Boost/1.59.0_python2.7/x86_64-centos7-gcc49-opt/ #-------------------------------------------------------------------------------- # XercesC #-------------------------------------------------------------------------------- -export XercesC_HOME=$LCGRELEASES/XercesC/3.1.1p1-8ccd5/x86_64-cc7-gcc49-opt/ +export XercesC_HOME=$LCGRELEASES/XercesC/3.1.1p1/x86_64-centos7-gcc49-opt/ export PATH="$XercesC_HOME/bin:$PATH" export LD_LIBRARY_PATH="$XercesC_HOME/lib:$LD_LIBRARY_PATH" - - - - diff --git a/.gitlab-ci.d/init_x86_64-slc6-gcc49-opt.sh b/.gitlab-ci.d/init_x86_64-slc6-gcc49-opt.sh index f5883e37cb03b847dd0a4e9491e8a10e40a17d8a..167556ec14ea860a99cfe81baf28031e0eb1c2ac 100644 --- a/.gitlab-ci.d/init_x86_64-slc6-gcc49-opt.sh +++ b/.gitlab-ci.d/init_x86_64-slc6-gcc49-opt.sh @@ -54,6 +54,7 @@ export LD_LIBRARY_PATH="$ROOTSYS/lib:$LD_LIBRARY_PATH" #-------------------------------------------------------------------------------- # LCIO #-------------------------------------------------------------------------------- + export LCIO="/afs/cern.ch/eng/clic/software/lcio/v02-08/x86_64-slc6-gcc49-opt" export PYTHONPATH="$LCIO/src/python:$LCIO/examples/python:$PYTHONPATH" export PATH="$LCIO/tools:$LCIO/bin:$PATH" @@ -67,6 +68,15 @@ export G4INSTALL=$LCGRELEASES/Geant4/10.01.p02/x86_64-slc6-gcc49-opt/ export G4ENV_INIT="$G4INSTALL/bin/geant4.sh" export G4SYSTEM="Linux-g++" +#-------------------------------------------------------------------------------- +# QT +#-------------------------------------------------------------------------------- + +export QTDIR=$LCGRELEASES/qt/4.8.4/x86_64-slc6-gcc49-opt +export QMAKESPEC="$QTDIR/mkspecs/linux-g++" +export PATH="$QTDIR/bin:$PATH" +export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" + #-------------------------------------------------------------------------------- # Boost #--------------------------------------------------------------------------------