From f605f81a56169628faec25f38084c7f82a90b80a Mon Sep 17 00:00:00 2001 From: Vakho Tsulaia <vakhtang.tsulaia@cern.ch> Date: Sat, 8 Dec 2018 00:05:43 +0100 Subject: [PATCH] Switched to the new version of externals: 2.0.16 --- Projects/AnalysisBase/externals.txt | 2 +- Projects/AnalysisTop/externals.txt | 2 +- Projects/AthDataQuality/externals.txt | 2 +- Projects/AthSimulation/externals.txt | 2 +- Projects/Athena/build_externals.sh | 8 ++++---- Projects/Athena/externals.txt | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Projects/AnalysisBase/externals.txt b/Projects/AnalysisBase/externals.txt index d3a941f4fcb..7d68682b44e 100644 --- a/Projects/AnalysisBase/externals.txt +++ b/Projects/AnalysisBase/externals.txt @@ -6,4 +6,4 @@ # forbidden. # The version of atlas/atlasexternals to use: -AnalysisBaseExternalsVersion = 2.0.15.1 +AnalysisBaseExternalsVersion = 2.0.17 diff --git a/Projects/AnalysisTop/externals.txt b/Projects/AnalysisTop/externals.txt index 5d627a3ad9f..8dae2256cec 100644 --- a/Projects/AnalysisTop/externals.txt +++ b/Projects/AnalysisTop/externals.txt @@ -1,4 +1,4 @@ # Versions of the various externals to build before starting the build of # this project, when doing a full stack nightly build. -AnalysisBaseExternalsVersion = 2.0.15.1 +AnalysisBaseExternalsVersion = 2.0.17 diff --git a/Projects/AthDataQuality/externals.txt b/Projects/AthDataQuality/externals.txt index dd2d05d250d..ccb4bdedc50 100644 --- a/Projects/AthDataQuality/externals.txt +++ b/Projects/AthDataQuality/externals.txt @@ -5,4 +5,4 @@ # an "origin/" prefix before it. For tags however this is explicitly # forbidden. -AtlasExternalsVersion = 2.0.15.1 +AtlasExternalsVersion = 2.0.17 diff --git a/Projects/AthSimulation/externals.txt b/Projects/AthSimulation/externals.txt index f5bcaa4b255..f3b864223fb 100644 --- a/Projects/AthSimulation/externals.txt +++ b/Projects/AthSimulation/externals.txt @@ -6,7 +6,7 @@ # forbidden. # The version of atlas/atlasexternals to use: -AthSimulationExternalsVersion = 2.0.15.1 +AthSimulationExternalsVersion = 2.0.17 # The version of atlas/Gaudi to use: GaudiVersion = v31r0.000 diff --git a/Projects/Athena/build_externals.sh b/Projects/Athena/build_externals.sh index efbf77369ce..9683078b6b6 100755 --- a/Projects/Athena/build_externals.sh +++ b/Projects/Athena/build_externals.sh @@ -139,9 +139,9 @@ fi AthenaExternalsVersion=$(awk '/^AthenaExternalsVersion/{print $3}' ${thisdir}/externals.txt) # Check out AthenaExternals from the right branch/tag: -#${scriptsdir}/checkout_atlasexternals.sh \ -# -t ${AthenaExternalsVersion} \ -# -s ${BUILDDIR}/src/AthenaExternals 2>&1 | tee ${BUILDDIR}/src/checkout.AthenaExternals.log +${scriptsdir}/checkout_atlasexternals.sh \ + -t ${AthenaExternalsVersion} \ + -s ${BUILDDIR}/src/AthenaExternals 2>&1 | tee ${BUILDDIR}/src/checkout.AthenaExternals.log # log analyzer never affects return status in the parent shell: { @@ -162,7 +162,7 @@ AthenaExternalsVersion=$(awk '/^AthenaExternalsVersion/{print $3}' ${thisdir}/ex ## Build AthenaExternals: export NICOS_PROJECT_HOME=$(cd ${BUILDDIR}/install;pwd)/AthenaExternals ${scriptsdir}/build_atlasexternals.sh \ - -s /build1/tsulaia/athena-devel/atlasexternals/src \ + -s ${BUILDDIR}/src/AthenaExternals \ -b ${BUILDDIR}/build/AthenaExternals \ -i ${BUILDDIR}/install/AthenaExternals/${NICOS_PROJECT_VERSION} \ -p AthenaExternals ${RPMOPTIONS} -t ${BUILDTYPE} \ diff --git a/Projects/Athena/externals.txt b/Projects/Athena/externals.txt index 8c7b973bd3a..53d70f43146 100644 --- a/Projects/Athena/externals.txt +++ b/Projects/Athena/externals.txt @@ -6,7 +6,7 @@ # forbidden. # The version of atlas/atlasexternals to use: -AthenaExternalsVersion = 2.0.15.1 +AthenaExternalsVersion = 2.0.17 # The version of atlas/Gaudi to use: GaudiVersion = v31r0.000 -- GitLab