From 11847847dc4f5e8d8a7bf6d5079e4e9396a67ea6 Mon Sep 17 00:00:00 2001
From: Johannes Elmsheuser <johannes.elmsheuser@cern.ch>
Date: Mon, 16 Dec 2024 19:59:44 +0100
Subject: [PATCH] Projects: Update to LCG_106b_ATLAS_1, atlasexternals 2.1.36
and tdaq/tdaq-common 12-00-00
Projects: Update to LCG_106b_ATLAS_1, atlasexternals 2.1.36 and tdaq/tdaq-common 12-00-00
---
Projects/AnalysisBase/externals.txt | 2 +-
Projects/AthAnalysis/build_externals.sh | 2 +-
Projects/AthAnalysis/externals.txt | 2 +-
Projects/AthGeneration/build_externals.sh | 2 +-
Projects/AthGeneration/externals.txt | 2 +-
Projects/AthSimulation/build_externals.sh | 2 +-
Projects/AthSimulation/externals.txt | 2 +-
Projects/Athena/CMakeLists.txt | 4 ++--
Projects/Athena/build_externals.sh | 2 +-
Projects/Athena/externals.txt | 2 +-
Projects/DetCommon/CMakeLists.txt | 4 ++--
Projects/DetCommon/externals.txt | 2 +-
Projects/VP1Light/externals.txt | 2 +-
13 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/Projects/AnalysisBase/externals.txt b/Projects/AnalysisBase/externals.txt
index 36d0f4784ef..392e39e0b21 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.1.35
+AnalysisBaseExternalsVersion = 2.1.36
diff --git a/Projects/AthAnalysis/build_externals.sh b/Projects/AthAnalysis/build_externals.sh
index ec398a56e6c..83bcc6850aa 100755
--- a/Projects/AthAnalysis/build_externals.sh
+++ b/Projects/AthAnalysis/build_externals.sh
@@ -10,7 +10,7 @@ ATLAS_PROJECT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}) && pwd)
ATLAS_EXT_PROJECT_NAME="AthAnalysisExternals"
ATLAS_BUILDTYPE="Release"
ATLAS_EXTRA_CMAKE_ARGS=(-DLCG_VERSION_NUMBER=106
- -DLCG_VERSION_POSTFIX="a_ATLAS_7"
+ -DLCG_VERSION_POSTFIX="b_ATLAS_1"
-DATLAS_ONNXRUNTIME_USE_CUDA=FALSE
-DATLAS_GAUDI_SOURCE="URL;https://gitlab.cern.ch/atlas/Gaudi/-/archive/v39r1.001/Gaudi-v39r1.001.tar.gz;URL_MD5;ac2bdcde14c2feb7684e34d6e7879db8")
ATLAS_EXTRA_MAKE_ARGS=()
diff --git a/Projects/AthAnalysis/externals.txt b/Projects/AthAnalysis/externals.txt
index 381faab1031..2845d38a99d 100644
--- a/Projects/AthAnalysis/externals.txt
+++ b/Projects/AthAnalysis/externals.txt
@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthAnalysisExternalsVersion = 2.1.35
+AthAnalysisExternalsVersion = 2.1.36
diff --git a/Projects/AthGeneration/build_externals.sh b/Projects/AthGeneration/build_externals.sh
index feba2f98af6..04151595ed7 100755
--- a/Projects/AthGeneration/build_externals.sh
+++ b/Projects/AthGeneration/build_externals.sh
@@ -10,7 +10,7 @@ ATLAS_PROJECT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}) && pwd)
ATLAS_EXT_PROJECT_NAME="AthGenerationExternals"
ATLAS_BUILDTYPE="Release"
ATLAS_EXTRA_CMAKE_ARGS=(-DLCG_VERSION_NUMBER=106
- -DLCG_VERSION_POSTFIX="a_ATLAS_7"
+ -DLCG_VERSION_POSTFIX="b_ATLAS_1"
-DATLAS_GAUDI_SOURCE="URL;https://gitlab.cern.ch/atlas/Gaudi/-/archive/v39r1.001/Gaudi-v39r1.001.tar.gz;URL_MD5;ac2bdcde14c2feb7684e34d6e7879db8"
-DATLAS_GEOMODEL_SOURCE="URL;https://gitlab.cern.ch/GeoModelDev/GeoModel/-/archive/6.7.0/GeoModel-6.7.0.tar.bz2;URL_MD5;450616aa33f97857aad3c7cbe1ff74fd")
ATLAS_EXTRA_MAKE_ARGS=()
diff --git a/Projects/AthGeneration/externals.txt b/Projects/AthGeneration/externals.txt
index a9d4ae06db1..c8b170ae511 100644
--- a/Projects/AthGeneration/externals.txt
+++ b/Projects/AthGeneration/externals.txt
@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthGenerationExternalsVersion = 2.1.35
+AthGenerationExternalsVersion = 2.1.36
diff --git a/Projects/AthSimulation/build_externals.sh b/Projects/AthSimulation/build_externals.sh
index d5d69a48555..eb75121caf1 100755
--- a/Projects/AthSimulation/build_externals.sh
+++ b/Projects/AthSimulation/build_externals.sh
@@ -10,7 +10,7 @@ ATLAS_PROJECT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}) && pwd)
ATLAS_EXT_PROJECT_NAME="AthSimulationExternals"
ATLAS_BUILDTYPE="Release"
ATLAS_EXTRA_CMAKE_ARGS=(-DLCG_VERSION_NUMBER=106
- -DLCG_VERSION_POSTFIX="a_ATLAS_7"
+ -DLCG_VERSION_POSTFIX="b_ATLAS_1"
-DATLAS_GAUDI_SOURCE="URL;https://gitlab.cern.ch/atlas/Gaudi/-/archive/v39r1.001/Gaudi-v39r1.001.tar.gz;URL_MD5;ac2bdcde14c2feb7684e34d6e7879db8"
-DATLAS_GEOMODEL_SOURCE="URL;https://gitlab.cern.ch/GeoModelDev/GeoModel/-/archive/6.7.0/GeoModel-6.7.0.tar.bz2;URL_MD5;450616aa33f97857aad3c7cbe1ff74fd"
-DATLAS_GEANT4_USE_LTO=TRUE
diff --git a/Projects/AthSimulation/externals.txt b/Projects/AthSimulation/externals.txt
index 28868fa20b8..09af3b58574 100644
--- a/Projects/AthSimulation/externals.txt
+++ b/Projects/AthSimulation/externals.txt
@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthSimulationExternalsVersion = 2.1.35
+AthSimulationExternalsVersion = 2.1.36
diff --git a/Projects/Athena/CMakeLists.txt b/Projects/Athena/CMakeLists.txt
index 8a3c95b3b0c..d44fe4a875b 100644
--- a/Projects/Athena/CMakeLists.txt
+++ b/Projects/Athena/CMakeLists.txt
@@ -38,9 +38,9 @@ if( LCG_NIGHTLY )
set( TDAQ_VERSION "99-00-00" CACHE STRING
"The version of tdaq to use for the build" )
else()
- set( TDAQ-COMMON_VERSION "11-04-00" CACHE STRING
+ set( TDAQ-COMMON_VERSION "12-00-00" CACHE STRING
"The version of tdaq-common to use for the build" )
- set( TDAQ_VERSION "11-04-00" CACHE STRING
+ set( TDAQ_VERSION "12-00-00" CACHE STRING
"The version of tdaq to use for the build" )
endif()
diff --git a/Projects/Athena/build_externals.sh b/Projects/Athena/build_externals.sh
index c226bc3f6cf..476aea6c263 100755
--- a/Projects/Athena/build_externals.sh
+++ b/Projects/Athena/build_externals.sh
@@ -10,7 +10,7 @@ ATLAS_PROJECT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}) && pwd)
ATLAS_EXT_PROJECT_NAME="AthenaExternals"
ATLAS_BUILDTYPE="Release"
ATLAS_EXTRA_CMAKE_ARGS=(-DLCG_VERSION_NUMBER=106
- -DLCG_VERSION_POSTFIX="a_ATLAS_7"
+ -DLCG_VERSION_POSTFIX="b_ATLAS_1"
-DATLAS_GAUDI_SOURCE="URL;https://gitlab.cern.ch/atlas/Gaudi/-/archive/v39r1.001/Gaudi-v39r1.001.tar.gz;URL_MD5;ac2bdcde14c2feb7684e34d6e7879db8"
-DATLAS_ACTS_SOURCE="URL;https://github.com/acts-project/acts/archive/refs/tags/v38.1.0.tar.gz;URL_HASH;SHA256=e85f0cfa778b39e81702d498176c144c2952311d5c89bed264942b8528095dbe"
-DATLAS_GEOMODEL_SOURCE="URL;https://gitlab.cern.ch/GeoModelDev/GeoModel/-/archive/6.7.0/GeoModel-6.7.0.tar.bz2;URL_MD5;450616aa33f97857aad3c7cbe1ff74fd"
diff --git a/Projects/Athena/externals.txt b/Projects/Athena/externals.txt
index 8cf908c94af..bee3df16bc5 100644
--- a/Projects/Athena/externals.txt
+++ b/Projects/Athena/externals.txt
@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthenaExternalsVersion = 2.1.35
+AthenaExternalsVersion = 2.1.36
diff --git a/Projects/DetCommon/CMakeLists.txt b/Projects/DetCommon/CMakeLists.txt
index faeee8c33ee..70d606c7f2e 100644
--- a/Projects/DetCommon/CMakeLists.txt
+++ b/Projects/DetCommon/CMakeLists.txt
@@ -8,7 +8,7 @@ project( DetCommon VERSION ${_version} LANGUAGES C CXX )
unset( _version )
# Set the version of tdaq-common to use for the build:
-set( TDAQ-COMMON_VERSION "11-04-00" CACHE STRING
+set( TDAQ-COMMON_VERSION "12-00-00" CACHE STRING
"The version of tdaq-common to use for the build" )
set( TDAQ-COMMON_ATROOT
"$ENV{TDAQ_RELEASE_BASE}/tdaq-common/tdaq-common-${TDAQ-COMMON_VERSION}"
@@ -18,7 +18,7 @@ set( TDAQ-COMMON_ATROOT
find_package( AtlasCMake QUIET )
# Build the project against LCG:
-set( LCG_VERSION_POSTFIX "a" # Needs to match tdaq release (NO layer, ATLINFR-3977)
+set( LCG_VERSION_POSTFIX "b" # Needs to match tdaq release (NO layer, ATLINFR-3977)
CACHE STRING "Version postfix for the LCG release to use" )
set( LCG_VERSION_NUMBER 106
CACHE STRING "Version number for the LCG release to use" )
diff --git a/Projects/DetCommon/externals.txt b/Projects/DetCommon/externals.txt
index a373f78cfd9..a7314255931 100644
--- a/Projects/DetCommon/externals.txt
+++ b/Projects/DetCommon/externals.txt
@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AtlasExternalsVersion = 2.1.35
+AtlasExternalsVersion = 2.1.36
diff --git a/Projects/VP1Light/externals.txt b/Projects/VP1Light/externals.txt
index 1996b82e2f2..ec022b399cb 100644
--- a/Projects/VP1Light/externals.txt
+++ b/Projects/VP1Light/externals.txt
@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-VP1LightExternalsVersion = 2.1.35
+VP1LightExternalsVersion = 2.1.36
--
GitLab