From 9d841ce9f09473ebada89aab57601d3268a7fd33 Mon Sep 17 00:00:00 2001
From: Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
Date: Thu, 7 May 2020 16:30:31 +0200
Subject: [PATCH] Updated all projects to atlasexternals-2.0.66.
At the same time updated how AthGeneration and Athena would set up
the usage of flake8_atlas during the build.
Also added a pre-configuration file to AthGeneration to make sure that
when we build a package against an AthGeneration nightly/release, by
default that build would use the same flake8_atlas settings as the
underlying nightly/release.
---
Projects/AnalysisBase/externals.txt | 2 +-
Projects/AthDataQuality/externals.txt | 2 +-
Projects/AthGeneration/CMakeLists.txt | 15 ++++++++++-----
Projects/AthGeneration/cmake/PreConfig.cmake.in | 10 ++++++++++
Projects/AthGeneration/externals.txt | 2 +-
Projects/AthSimulation/externals.txt | 2 +-
Projects/Athena/CMakeLists.txt | 7 ++++---
Projects/Athena/cmake/PreConfig.cmake.in | 6 +++---
Projects/Athena/externals.txt | 2 +-
Projects/VP1Light/externals.txt | 2 +-
10 files changed, 33 insertions(+), 17 deletions(-)
create mode 100644 Projects/AthGeneration/cmake/PreConfig.cmake.in
diff --git a/Projects/AnalysisBase/externals.txt b/Projects/AnalysisBase/externals.txt
index 4cd49083bd4..5f0664beebe 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.65
+AnalysisBaseExternalsVersion = 2.0.66
diff --git a/Projects/AthDataQuality/externals.txt b/Projects/AthDataQuality/externals.txt
index 476a4654143..224c083fb92 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.65
+AtlasExternalsVersion = 2.0.66
diff --git a/Projects/AthGeneration/CMakeLists.txt b/Projects/AthGeneration/CMakeLists.txt
index a69f765b983..2b1dc97f7ab 100644
--- a/Projects/AthGeneration/CMakeLists.txt
+++ b/Projects/AthGeneration/CMakeLists.txt
@@ -8,10 +8,11 @@ project( AthGeneration VERSION ${_version} LANGUAGES C CXX Fortran )
unset( _version )
# Configure flake8:
-set( ATLAS_FLAKE8 "flake8_atlas --select ATL,F,E101,E7,E9,W6 --ignore ATL238,ATL9,E701,E702,E704,E741 --enable-extensions ATL902"
+set( ATLAS_FLAKE8 flake8_atlas --select ATL,F,E101,E7,E9,W6
+ --ignore ATL238,ATL9,E701,E702,E704,E741
+ --enable-extensions ATL902
CACHE STRING "Default flake8 command" )
-
-set( ATLAS_PYTHON_CHECKER "${ATLAS_FLAKE8} --filterFiles AthenaConfiguration"
+set( ATLAS_PYTHON_CHECKER ${ATLAS_FLAKE8} --filterFiles AthenaConfiguration
CACHE STRING "Python checker command to run during Python module compilation" )
# Find the ATLAS CMake code:
@@ -77,9 +78,13 @@ string( REPLACE "$ENV{TDAQ_RELEASE_BASE}" "\$ENV{TDAQ_RELEASE_BASE}"
TDAQ-COMMON_ATROOT "${TDAQ-COMMON_ATROOT}" )
string( REPLACE "${TDAQ-COMMON_VERSION}" "\${TDAQ-COMMON_VERSION}"
TDAQ-COMMON_ATROOT "${TDAQ-COMMON_ATROOT}" )
+configure_file( ${CMAKE_SOURCE_DIR}/cmake/PreConfig.cmake.in
+ ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/PreConfig.cmake @ONLY )
configure_file( ${CMAKE_SOURCE_DIR}/cmake/PostConfig.cmake.in
- ${CMAKE_BINARY_DIR}/PostConfig.cmake @ONLY )
-install( FILES ${CMAKE_BINARY_DIR}/PostConfig.cmake
+ ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/PostConfig.cmake @ONLY )
+install( FILES
+ ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/PreConfig.cmake
+ ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/PostConfig.cmake
DESTINATION ${CMAKE_INSTALL_CMAKEDIR} )
# Package up the release using CPack:
diff --git a/Projects/AthGeneration/cmake/PreConfig.cmake.in b/Projects/AthGeneration/cmake/PreConfig.cmake.in
new file mode 100644
index 00000000000..bb88d84693a
--- /dev/null
+++ b/Projects/AthGeneration/cmake/PreConfig.cmake.in
@@ -0,0 +1,10 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+#
+# Pre-config script to propagate variables to downstream projects
+#
+
+# Set up the project's flake8 usage.
+set( ATLAS_FLAKE8 @ATLAS_FLAKE8@
+ CACHE STRING "Default flake8 command" )
+set( ATLAS_PYTHON_CHECKER @ATLAS_PYTHON_CHECKER@
+ CACHE STRING "Python checker command to run during Python module compilation" )
diff --git a/Projects/AthGeneration/externals.txt b/Projects/AthGeneration/externals.txt
index 2dabe38db58..2a58bb834c1 100644
--- a/Projects/AthGeneration/externals.txt
+++ b/Projects/AthGeneration/externals.txt
@@ -6,7 +6,7 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthGenerationExternalsVersion = 2.0.65
+AthGenerationExternalsVersion = 2.0.66
# The version of atlas/Gaudi to use:
GaudiVersion = v33r1.001
diff --git a/Projects/AthSimulation/externals.txt b/Projects/AthSimulation/externals.txt
index 22ba04f7a41..ffe85cbcc9c 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.65
+AthSimulationExternalsVersion = 2.0.66
# The version of atlas/Gaudi to use:
GaudiVersion = v33r1.001
diff --git a/Projects/Athena/CMakeLists.txt b/Projects/Athena/CMakeLists.txt
index d56dd3b518e..150d15736cc 100644
--- a/Projects/Athena/CMakeLists.txt
+++ b/Projects/Athena/CMakeLists.txt
@@ -41,10 +41,11 @@ mark_as_advanced( TDAQ-COMMON_ATROOT TDAQ_PROJECT_NAME
TDAQ_ATROOT )
# Configure flake8:
-set( ATLAS_FLAKE8 "flake8_atlas --select ATL,F,E101,E7,E9,W6 --ignore ATL238,ATL9,E701,E702,E704,E741 --enable-extensions ATL902"
+set( ATLAS_FLAKE8 flake8_atlas --select ATL,F,E101,E7,E9,W6
+ --ignore ATL238,ATL9,E701,E702,E704,E741
+ --enable-extensions ATL902
CACHE STRING "Default flake8 command" )
-
-set( ATLAS_PYTHON_CHECKER "${ATLAS_FLAKE8} --filterFiles AthenaConfiguration"
+set( ATLAS_PYTHON_CHECKER ${ATLAS_FLAKE8} --filterFiles AthenaConfiguration
CACHE STRING "Python checker command to run during Python module compilation" )
# Find the ATLAS CMake code:
diff --git a/Projects/Athena/cmake/PreConfig.cmake.in b/Projects/Athena/cmake/PreConfig.cmake.in
index 7ab85c3097c..9b2078c3cc8 100644
--- a/Projects/Athena/cmake/PreConfig.cmake.in
+++ b/Projects/Athena/cmake/PreConfig.cmake.in
@@ -3,10 +3,10 @@
# Pre-config script to propagate variables to downstream projects
#
-set( ATLAS_FLAKE8 "@ATLAS_FLAKE8@"
+# Set up the project's flake8 usage.
+set( ATLAS_FLAKE8 @ATLAS_FLAKE8@
CACHE STRING "Default flake8 command" )
-
-set( ATLAS_PYTHON_CHECKER "@ATLAS_PYTHON_CHECKER@"
+set( ATLAS_PYTHON_CHECKER @ATLAS_PYTHON_CHECKER@
CACHE STRING "Python checker command to run during Python module compilation" )
# Figure out whether to use QUIET in the following calls.
diff --git a/Projects/Athena/externals.txt b/Projects/Athena/externals.txt
index 0f87b8b7d00..73dd5fc9a59 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.65
+AthenaExternalsVersion = 2.0.66
# The version of atlas/Gaudi to use:
GaudiVersion = v33r1.001
diff --git a/Projects/VP1Light/externals.txt b/Projects/VP1Light/externals.txt
index 765bc91747d..a8ad37cbba3 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.0.65
+VP1LightExternalsVersion = 2.0.66
--
GitLab