Updated AthGeneration to atlasexternals-2.0.86, and Gaudi-v35r0.000.

Projects/AthGeneration/build_env.sh

@@ -61,14 +61,6 @@ env_setup() {
         source ${extDir}/*/setup.sh
     fi
 
-    # Point to Gaudi:
-    # Get platform from the GAUDI build - we're assuming here that there's only one platform installed.
-    if [ -z "${GAUDI_ROOT+1}" ]; then
-        platform=$(cd ${BUILDDIR}/install/GAUDI/${version}/InstallArea/;ls)
-        export GAUDI_ROOT=${BUILDDIR}/install/GAUDI/${version}/InstallArea/${platform}
-    fi
-    echo "Taking Gaudi from: ${GAUDI_ROOT}"
-
     cd $startdir
 }
 

Projects/AthGeneration/build_externals.sh

@@ -169,45 +169,6 @@ ${scriptsdir}/build_atlasexternals.sh \
  } || true
 }
 
-# Get the "platform name" from the directory created by the AthGenerationExternals
-# build:
-platform=$(cd ${BUILDDIR}/install/AthGenerationExternals/${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
-
-{
- test "X${NIGHTLY_STATUS}" != "X" && {
-   (set +e
-    ${scriptsdir_nightly_status}/checkout_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" GAUDI ${BUILDDIR}/src/checkout.GAUDI.log
-   )
- } || true
-}
-
-# Build Gaudi:
-${scriptsdir}/build_Gaudi.sh \
-    -s ${BUILDDIR}/src/GAUDI \
-    -b ${BUILDDIR}/build/GAUDI \
-    -i ${BUILDDIR}/install \
-    -e ${BUILDDIR}/install/AthGenerationExternals/${version}/InstallArea/${platform} \
-    -v ${version} \
-    -p AthGenerationExternals -f ${platform} ${RPMOPTIONS} -t ${BUILDTYPE} \
-    ${EXTRACMAKE[@]/#/-x } || ((ERROR_COUNT++))
-
-{
- test "X${NIGHTLY_STATUS}" != "X" && {
-   (set +e
-    ${scriptsdir_nightly_status}/cmake_config_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" GAUDI ${BUILDDIR}/build/GAUDI/cmake_config.log
-    ${scriptsdir_nightly_status}/cmake_build_status.sh  "$branch" "$BINARY_TAG" "$timestamp_tmp" GAUDI ${BUILDDIR}/build/GAUDI/cmake_build.log
-   )
- } || true
-}
-
 # Exit with the error count taken into account.
 if [ ${ERROR_COUNT} -ne 0 ]; then
     echo "AthGeneration externals build encountered ${ERROR_COUNT} error(s)"

Projects/AthGeneration/externals.txt

@@ -6,7 +6,4 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AthGenerationExternalsVersion = 2.0.85
-
-# The version of atlas/Gaudi to use:
-GaudiVersion = v34r1.001
+AthGenerationExternalsVersion = 2.0.86