From 0f39b9d5eff00cd25aa47d8b7e9af4863cd03095 Mon Sep 17 00:00:00 2001
From: Tamara Vazquez Schroeder <tamara.vazquez.schroeder@cern.ch>
Date: Wed, 13 Sep 2017 13:06:54 +0000
Subject: [PATCH] Merge branch 'ART-sept13' into '21.0'
fix TDAQ_RELEASE_BASE in art-task-build script
See merge request !4621
Former-commit-id: fbb7c427f7b79e2ee01d134e421606711ba56d41
---
Tools/ART/scripts/art-task-build.sh | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/Tools/ART/scripts/art-task-build.sh b/Tools/ART/scripts/art-task-build.sh
index 4acd19233ba..8f9564a9609 100755
--- a/Tools/ART/scripts/art-task-build.sh
+++ b/Tools/ART/scripts/art-task-build.sh
@@ -22,6 +22,14 @@ BRANCH=`echo $RELEASE_BASE |tr "/" " " |awk '{print $5}'`
source ${ATLAS_LOCAL_ROOT_BASE}/user/atlasLocalSetup.sh --quiet
lsetup asetup
asetup none,cmakesetup --platform ${PLATFORM}
+
+if [ -d /cvmfs/atlas.cern.ch/repo/sw/tdaq ]; then
+ echo "WARNING: Setting TDAQ_RELEASE_BASE to /cvmfs/atlas.cern.ch/repo/sw/tdaq"
+ export TDAQ_RELEASE_BASE=/cvmfs/atlas.cern.ch/repo/sw/tdaq
+else
+ echo "Error: Cannot find TDAQ software installation"
+ return 1
+fi
source ${RELEASE_BASE}/build/install/${PROJECT}/*/InstallArea/${PLATFORM}/setup.sh
# run build tests
--
GitLab