From 788c85a5776182ed0ea8d5beda99a2eb7356ec1b Mon Sep 17 00:00:00 2001
From: Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
Date: Fri, 15 Jan 2021 09:41:00 +0100
Subject: [PATCH 1/2] Simplified the environment setup scripts.
By now, in the master branch, we only pick up LCG and TDAQ from
CVMFS by default. All that logic was not necessary anymore.
And with the unification of the project build scripts, that logic
actually prevented builds of AnalysisBase on hosts with no CVMFS
access.
---
Build/AtlasBuildScripts/LCG_RELEASE_BASE.sh | 11 ++---------
Build/AtlasBuildScripts/TDAQ_RELEASE_BASE.sh | 12 ++----------
2 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/Build/AtlasBuildScripts/LCG_RELEASE_BASE.sh b/Build/AtlasBuildScripts/LCG_RELEASE_BASE.sh
index 9125180f8f03..3fd6aa22f82a 100644
--- a/Build/AtlasBuildScripts/LCG_RELEASE_BASE.sh
+++ b/Build/AtlasBuildScripts/LCG_RELEASE_BASE.sh
@@ -1,3 +1,4 @@
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
#
# This helper script is meant to set up a valid value for the
# LCG_RELEASE_BASE environment variable for the builds.
@@ -9,16 +10,8 @@
#
if [ -z "${LCG_RELEASE_BASE}" ]; then
-
- if [ -d /cvmfs/sft.cern.ch/lcg/releases ]; then
- export LCG_RELEASE_BASE=/cvmfs/sft.cern.ch/lcg/releases
- elif [ -d /afs/cern.ch/sw/lcg/releases ]; then
- export LCG_RELEASE_BASE=/afs/cern.ch/sw/lcg/releases
- elif [ -d /cvmfs/atlas.cern.ch/repo/sw/software/21.0/sw/lcg/releases ]; then
- export LCG_RELEASE_BASE=/cvmfs/atlas.cern.ch/repo/sw/software/21.0/sw/lcg/releases
- fi
+ export LCG_RELEASE_BASE=/cvmfs/sft.cern.ch/lcg/releases
echo "Set LCG_RELEASE_BASE = ${LCG_RELEASE_BASE}"
-
else
echo "Leaving LCG_RELEASE_BASE = ${LCG_RELEASE_BASE}"
fi
diff --git a/Build/AtlasBuildScripts/TDAQ_RELEASE_BASE.sh b/Build/AtlasBuildScripts/TDAQ_RELEASE_BASE.sh
index 297fa9e6332b..86e05d98d0c7 100644
--- a/Build/AtlasBuildScripts/TDAQ_RELEASE_BASE.sh
+++ b/Build/AtlasBuildScripts/TDAQ_RELEASE_BASE.sh
@@ -1,3 +1,4 @@
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
#
# This helper script is meant to set up a valid value for the
# TDAQ_RELEASE_BASE environment variable for the builds.
@@ -9,17 +10,8 @@
#
if [ -z "${TDAQ_RELEASE_BASE}" ]; then
-
- if [ -d /cvmfs/atlas.cern.ch/repo/sw/tdaq ]; then
- export TDAQ_RELEASE_BASE=/cvmfs/atlas.cern.ch/repo/sw/tdaq
- elif [ -d /afs/cern.ch/atlas/project/tdaq/prod ]; then
- export TDAQ_RELEASE_BASE=/afs/cern.ch/atlas/project/tdaq/prod
- else
- echo "Error: Cannot find TDAQ software installation"
- return 1
- fi
+ export TDAQ_RELEASE_BASE=/cvmfs/atlas.cern.ch/repo/sw/tdaq
echo "Set TDAQ_RELEASE_BASE = ${TDAQ_RELEASE_BASE}"
-
else
echo "Leaving TDAQ_RELEASE_BASE = ${TDAQ_RELEASE_BASE}"
fi
--
GitLab
From 88607202a9d1fac1d41987f8ef3eb79d9b022ad7 Mon Sep 17 00:00:00 2001
From: Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
Date: Fri, 15 Jan 2021 09:47:17 +0100
Subject: [PATCH 2/2] Removed the unnecessary use of ATLAS_PROJECT_NAME from
the build_externals.sh scripts.
---
Build/AtlasBuildScripts/build_project_externals.sh | 8 +++-----
Projects/AnalysisBase/build_externals.sh | 1 -
Projects/AthAnalysis/build_externals.sh | 1 -
Projects/AthGeneration/build_externals.sh | 1 -
Projects/AthSimulation/build_externals.sh | 1 -
Projects/Athena/build_externals.sh | 1 -
Projects/VP1Light/build_externals.sh | 1 -
7 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/Build/AtlasBuildScripts/build_project_externals.sh b/Build/AtlasBuildScripts/build_project_externals.sh
index 93484481aaae..c3b288d46b45 100644
--- a/Build/AtlasBuildScripts/build_project_externals.sh
+++ b/Build/AtlasBuildScripts/build_project_externals.sh
@@ -5,8 +5,6 @@
#
# The includer script must set (default) values for the following variables
# before sourcing this script:
-# - ATLAS_PROJECT_NAME: The name of the main project, for which this script
-# is building an "externals project".
# - ATLAS_PROJECT_DIR: Directory of the project that this script is being used
# from.
# - ATLAS_EXT_PROJECT_NAME: The name of the "externals project" needed by the
@@ -21,7 +19,7 @@
# Function printing the usage information for the script.
usage() {
- echo "Script building ${ATLAS_EXT_PROJECT_NAME} for ${ATLAS_PROJECT_NAME}"
+ echo "Script building ${ATLAS_EXT_PROJECT_NAME}."
echo ""
echo "Usage: build_externals.sh [options]"
echo "Options:"
@@ -111,7 +109,7 @@ mkdir -p "${ATLAS_BUILD_DIR}"
ATLAS_BUILD_DIR=$(cd "${ATLAS_BUILD_DIR}" && pwd)
# Greet the user.
-echo "Building the externals for ${ATLAS_PROJECT_NAME} in: ${ATLAS_BUILD_DIR}"
+echo "Building ${ATLAS_EXT_PROJECT_NAME} in: ${ATLAS_BUILD_DIR}"
# Clean the build directory, if necessary.
if [ "$ATLAS_FORCE_REBUILD" = "1" ]; then
@@ -180,7 +178,7 @@ fi
# Exit with the error count taken into account.
if [ ${ERROR_COUNT} -ne 0 ]; then
- echo "${ATLAS_PROJECT_NAME} externals build encountered ${ERROR_COUNT} error(s)"
+ echo "${ATLAS_EXT_PROJECT_NAME} build encountered ${ERROR_COUNT} error(s)"
else
cp "${ATLAS_PROJECT_DIR}/externals.txt" "${externals_stamp}"
fi
diff --git a/Projects/AnalysisBase/build_externals.sh b/Projects/AnalysisBase/build_externals.sh
index b771df323df3..50045e727b3e 100755
--- a/Projects/AnalysisBase/build_externals.sh
+++ b/Projects/AnalysisBase/build_externals.sh
@@ -6,7 +6,6 @@
#
# Set up the variables necessary for the script doing the heavy lifting.
-ATLAS_PROJECT_NAME="AnalysisBase"
ATLAS_PROJECT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}) && pwd)
ATLAS_EXT_PROJECT_NAME="AnalysisBaseExternals"
ATLAS_BUILDTYPE="RelWithDebInfo"
diff --git a/Projects/AthAnalysis/build_externals.sh b/Projects/AthAnalysis/build_externals.sh
index 74625a642f5e..0dccc387a813 100755
--- a/Projects/AthAnalysis/build_externals.sh
+++ b/Projects/AthAnalysis/build_externals.sh
@@ -6,7 +6,6 @@
#
# Set up the variables necessary for the script doing the heavy lifting.
-ATLAS_PROJECT_NAME="AthAnalysis"
ATLAS_PROJECT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}) && pwd)
ATLAS_EXT_PROJECT_NAME="AthAnalysisExternals"
ATLAS_BUILDTYPE="RelWithDebInfo"
diff --git a/Projects/AthGeneration/build_externals.sh b/Projects/AthGeneration/build_externals.sh
index 6cc8883ce90d..063ff84293b1 100755
--- a/Projects/AthGeneration/build_externals.sh
+++ b/Projects/AthGeneration/build_externals.sh
@@ -6,7 +6,6 @@
#
# Set up the variables necessary for the script doing the heavy lifting.
-ATLAS_PROJECT_NAME="AthGeneration"
ATLAS_PROJECT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}) && pwd)
ATLAS_EXT_PROJECT_NAME="AthGenerationExternals"
ATLAS_BUILDTYPE="RelWithDebInfo"
diff --git a/Projects/AthSimulation/build_externals.sh b/Projects/AthSimulation/build_externals.sh
index 513e997e4cf6..dbd91cdef27a 100755
--- a/Projects/AthSimulation/build_externals.sh
+++ b/Projects/AthSimulation/build_externals.sh
@@ -6,7 +6,6 @@
#
# Set up the variables necessary for the script doing the heavy lifting.
-ATLAS_PROJECT_NAME="AthSimulation"
ATLAS_PROJECT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}) && pwd)
ATLAS_EXT_PROJECT_NAME="AthSimulationExternals"
ATLAS_BUILDTYPE="RelWithDebInfo"
diff --git a/Projects/Athena/build_externals.sh b/Projects/Athena/build_externals.sh
index 0498b0126c83..f454a09a382e 100755
--- a/Projects/Athena/build_externals.sh
+++ b/Projects/Athena/build_externals.sh
@@ -6,7 +6,6 @@
#
# Set up the variables necessary for the script doing the heavy lifting.
-ATLAS_PROJECT_NAME="Athena"
ATLAS_PROJECT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}) && pwd)
ATLAS_EXT_PROJECT_NAME="AthenaExternals"
ATLAS_BUILDTYPE="RelWithDebInfo"
diff --git a/Projects/VP1Light/build_externals.sh b/Projects/VP1Light/build_externals.sh
index 2258fa258301..f48d3df5b6b9 100755
--- a/Projects/VP1Light/build_externals.sh
+++ b/Projects/VP1Light/build_externals.sh
@@ -6,7 +6,6 @@
#
# Set up the variables necessary for the script doing the heavy lifting.
-ATLAS_PROJECT_NAME="VP1Light"
ATLAS_PROJECT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}) && pwd)
ATLAS_EXT_PROJECT_NAME="VP1LightExternals"
ATLAS_BUILDTYPE="RelWithDebInfo"
--
GitLab