From 6cd981886fb6527eaf75edf592037d62b0c4aa3e Mon Sep 17 00:00:00 2001
From: Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
Date: Thu, 19 Nov 2020 14:56:18 +0100
Subject: [PATCH] Updated AthSimulation to atlasexternals-2.0.86, and
Gaudi-v35r0.000.
---
Projects/AthSimulation/build_env.sh | 8 --------
Projects/AthSimulation/build_externals.sh | 22 ----------------------
Projects/AthSimulation/externals.txt | 5 +----
3 files changed, 1 insertion(+), 34 deletions(-)
diff --git a/Projects/AthSimulation/build_env.sh b/Projects/AthSimulation/build_env.sh
index 01a4d8cd1aa..64433d4805f 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 3de9f169edf..081d6901984 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 c5d54221cff..58f3ac05b56 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
--
GitLab