Merge branch 'BuildScriptUpdate-master-20210115' into 'master'

Build Script Updates, master branch (2021.01.15.)

See merge request !39733

Build/AtlasBuildScripts/LCG_RELEASE_BASE.sh

+# 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

Build/AtlasBuildScripts/TDAQ_RELEASE_BASE.sh

+# 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

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

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"

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"

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"

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"

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"

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"