diff --git a/Projects/AthSimulation/build_env.sh b/Projects/AthSimulation/build_env.sh index 01a4d8cd1aaa0eb8740754f441251e9a685a4efd..64433d4805f6c4448b10a1e6bb681dc2a00b747a 100644 --- a/Projects/AthSimulation/build_env.sh +++ b/Projects/AthSimulation/build_env.sh @@ -59,14 +59,6 @@ env_setup() { echo "Setting up AthSimulationExternals from: ${extDir}" source ${extDir}/*/setup.sh - # Get the "platform name" from the directory created by the AthSimulationExternals - # build: - platform=$(cd ${extDir};ls) - - # Point to Gaudi: - export GAUDI_ROOT=${BUILDDIR}/install/GAUDI/${version}/InstallArea/${platform} - echo "Taking Gaudi from: ${GAUDI_ROOT}" - cd $startdir } diff --git a/Projects/AthSimulation/build_externals.sh b/Projects/AthSimulation/build_externals.sh index 3de9f169edf3f2581d559c36cd2a990f03a6270c..081d69019849641fddf7a88731ef2a3f2d792066 100755 --- a/Projects/AthSimulation/build_externals.sh +++ b/Projects/AthSimulation/build_externals.sh @@ -135,28 +135,6 @@ ${scriptsdir}/build_atlasexternals.sh \ -p AthSimulationExternals ${RPMOPTIONS} -t ${BUILDTYPE} \ ${EXTRACMAKE[@]/#/-x } -v ${version} || ((ERROR_COUNT++)) -# Get the "platform name" from the directory created by the AthSimulationExternals -# build: -platform=$(cd ${BUILDDIR}/install/AthSimulationExternals/${version}/InstallArea;ls) - -# Read in the tag/branch to use for Gaudi: -GaudiVersion=$(awk '/^GaudiVersion/{print $3}' ${thisdir}/externals.txt) - -# Check out Gaudi from the right branch/tag: -${scriptsdir}/checkout_Gaudi.sh \ - -t ${GaudiVersion} \ - -s ${BUILDDIR}/src/GAUDI 2>&1 | tee ${BUILDDIR}/src/checkout.GAUDI.log - -# Build Gaudi: -${scriptsdir}/build_Gaudi.sh \ - -s ${BUILDDIR}/src/GAUDI \ - -b ${BUILDDIR}/build/GAUDI \ - -i ${BUILDDIR}/install \ - -e ${BUILDDIR}/install/AthSimulationExternals/${version}/InstallArea/${platform} \ - -v ${version} \ - -p AthSimulationExternals -f ${platform} ${EXTRACMAKE[@]/#/-x } \ - ${RPMOPTIONS} -t ${BUILDTYPE} || ((ERROR_COUNT++)) - # Exit with the error count taken into account. if [ ${ERROR_COUNT} -ne 0 ]; then echo "AthSimulation externals build encountered ${ERROR_COUNT} error(s)" diff --git a/Projects/AthSimulation/externals.txt b/Projects/AthSimulation/externals.txt index c5d54221cff50cbced770496eb6c3c1bc8699d5f..58f3ac05b566f8e3035e9560427cfa993ce5e088 100644 --- a/Projects/AthSimulation/externals.txt +++ b/Projects/AthSimulation/externals.txt @@ -6,7 +6,4 @@ # forbidden. # The version of atlas/atlasexternals to use: -AthSimulationExternalsVersion = 2.0.85 - -# The version of atlas/Gaudi to use: -GaudiVersion = v34r1.001 +AthSimulationExternalsVersion = 2.0.86