AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt

+################################################################################
+# Package: AthenaPoolTest
+################################################################################
+
+# Declare the package name:
+atlas_subdir( AthenaPoolTest )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PRIVATE
+                          AtlasTest/DatabaseTest/AthenaPoolTestData
+                          Calorimeter/CaloDetDescr
+                          Calorimeter/CaloEvent
+                          Calorimeter/CaloIdentifier
+                          Control/AthenaBaseComps
+                          Control/AthenaKernel
+                          Control/StoreGate
+                          Database/AthenaPOOL/AthenaPoolUtilities
+                          DetectorDescription/GeoModel/GeoModelInterfaces
+                          DetectorDescription/GeoPrimitives
+                          DetectorDescription/Identifier
+                          Event/EventInfo
+                          Event/EventInfoMgt
+                          GaudiKernel
+                          InnerDetector/InDetDetDescr/InDetIdentifier
+                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
+                          InnerDetector/InDetRawEvent/InDetRawData
+                          InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack
+                          InnerDetector/InDetRecEvent/InDetPrepRawData
+                          InnerDetector/InDetRecEvent/InDetRIO_OnTrack
+                          LArCalorimeter/LArRecEvent
+                          TestPolicy
+                          Tracking/TrkDetDescr/TrkSurfaces
+                          Tracking/TrkEvent/TrkCompetingRIOsOnTrack
+                          Tracking/TrkEvent/TrkEventPrimitives
+                          Tracking/TrkEvent/TrkMaterialOnTrack
+                          Tracking/TrkEvent/TrkParameters
+                          Tracking/TrkEvent/TrkTrack
+                          Tracking/TrkEvent/TrkVertexOnTrack )
+
+# External dependencies:
+find_package( Eigen )
+
+# Component(s) in the package:
+atlas_add_component( AthenaPoolTest
+                     src/AthenaPoolTestDataReader.cxx
+                     src/AthenaPoolTestDataWriter.cxx
+                     src/AthenaPoolTestAttrWriter.cxx
+                     src/AthenaPoolTestAttrReader.cxx
+                     src/InDetRawDataFakeReader.cxx
+                     src/InDetRawDataFakeWriter.cxx
+                     src/LArCellContFakeWriter.cxx
+                     src/LArCellContFakeReader.cxx
+                     src/EventInfoWriter.cxx
+                     src/EventInfoReader.cxx
+                     src/PileUpEventInfoWriter.cxx
+                     src/PileUpEventInfoReader.cxx
+                     src/TrkTrackFakeReader.cxx
+                     src/TrkTrackFakeWriter.cxx
+                     src/FakeTrackBuilder.cxx
+                     src/components/*.cxx
+                     INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaPoolTestData CaloDetDescrLib CaloEvent CaloIdentifier AthenaBaseComps AthenaKernel StoreGateLib SGtests AthenaPoolUtilities GeoPrimitives Identifier EventInfo GaudiKernel InDetIdentifier InDetReadoutGeometry InDetRawData InDetCompetingRIOsOnTrack InDetPrepRawData InDetRIO_OnTrack LArRecEvent TrkSurfaces TrkCompetingRIOsOnTrack TrkEventPrimitives TrkMaterialOnTrack TrkParameters TrkTrack TrkVertexOnTrack )
+
+# Install files from the package:
+atlas_install_headers( AthenaPoolTest )
+atlas_install_joboptions( share/*.py )
+

AtlasTest/DatabaseTest/AthenaPoolTest/src/InDetRawDataFakeWriter.cxx

@@ -328,8 +328,7 @@ StatusCode InDetRawDataFakeWriter::printRDOs() const
             rdo!=rdocoll->end() ; ++rdo) {
         
             ATH_MSG_DEBUG("RDO ID=" << m_sctId->show_to_string((*rdo)->identify()) 
-                          << "RDO grp=" << (*rdo)->getGroupSize() << " strip:" << 
-                          (*rdo)->getStrip() );
+                          << "RDO grp=" << (*rdo)->getGroupSize() );
         
         }
     }

AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/AthenaPoolTestD.h

@@ -24,20 +24,11 @@
 #ifndef ATHENAPOOLTESTDATA_ATHENAPOOLTESTD_H
 # define ATHENAPOOLTESTDATA_ATHENAPOOLTESTD_H
 
-//<<<<<< INCLUDES                                                       >>>>>>
 
 #include "AthenaPoolTestData/AthenaPoolTestC.h"
 //#include "CLHEP/Geometry/Point3D.h"
-//#include <string>
+#include <string>
 
-//<<<<<< PUBLIC DEFINES                                                 >>>>>>
-//<<<<<< PUBLIC CONSTANTS                                               >>>>>>
-//<<<<<< PUBLIC TYPES                                                   >>>>>>
-//<<<<<< PUBLIC VARIABLES                                               >>>>>>
-//<<<<<< PUBLIC FUNCTIONS                                               >>>>>>
-//<<<<<< CLASS DECLARATIONS                                             >>>>>>
-
-class string;
 
 class AthenaPoolTestD : public AthenaPoolTestC 
 {

AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/AthenaPoolTestMapData.h

@@ -39,7 +39,6 @@ public:
 
     AthenaPoolTestMapData();
     AthenaPoolTestMapData (const std::vector< Deposit >& deposits, int simDataWord = 0);
-    AthenaPoolTestMapData (const AthenaPoolTestMapData& other);
     virtual ~AthenaPoolTestMapData();
 
     int word() const;                           // Get the packed simdata word

AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/AthenaPoolTestMapDataLink.h

@@ -41,7 +41,6 @@ public:
     AthenaPoolTestMapDataLink();
     AthenaPoolTestMapDataLink(index_type barCode, index_type eventIndex = 0);
     AthenaPoolTestMapDataLink(const MyDummyClass* p, index_type eventIndex = 0);
-    AthenaPoolTestMapDataLink(const AthenaPoolTestMapDataLink& rhs);
     //@}
   
     /// \name indexing accessors (e.g. for writing)
@@ -56,7 +55,6 @@ public:
     public:
 	ExtendedBarCode();
 	ExtendedBarCode(index_type barcode, index_type eventIndex);
-	ExtendedBarCode(const ExtendedBarCode& rhs);
 
 	unsigned long  barcode() const;
 	unsigned short eventIndex() const;
@@ -79,9 +77,6 @@ inline AthenaPoolTestMapDataLink::ExtendedBarCode::ExtendedBarCode(index_type ba
     assert(eventIndex < std::numeric_limits<unsigned short>::max()); 
 }
 
-inline AthenaPoolTestMapDataLink::ExtendedBarCode::ExtendedBarCode(const ExtendedBarCode& rhs) :
-    m_BC(rhs.m_BC), m_evtIndex(rhs.m_evtIndex) {}
-
 inline unsigned long \
 AthenaPoolTestMapDataLink::ExtendedBarCode::barcode() const
 {
@@ -105,11 +100,6 @@ inline
 AthenaPoolTestMapDataLink::AthenaPoolTestMapDataLink(const MyDummyClass* /*p*/, index_type eventIndex) :
     m_particle(0), m_extBarcode(0, eventIndex) {}
 
-inline
-AthenaPoolTestMapDataLink::AthenaPoolTestMapDataLink(const AthenaPoolTestMapDataLink& rhs) : 
-    m_particle(rhs.m_particle),
-    m_extBarcode(rhs.m_extBarcode) {}
-
 inline int 
 AthenaPoolTestMapDataLink::barcode() const 
 { return int(m_extBarcode.barcode()); } //FIXME ret type

AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/TrigPath.h

@@ -19,8 +19,9 @@
 #include <string>
 #include <set>
 
-struct TrigPath
+class TrigPath
 {
+public:
 	TrigPath() : pathID(-1), l1bit(-1), l2bit(0) {}
 	TrigPath(int l1, int l2, int p) : 
 		pathID(p), l1bit(l1), l2bit(l2) {}

AtlasTest/DatabaseTest/AthenaPoolTestData/src/AthenaPoolTestMapData.cxx

@@ -40,12 +40,6 @@ AthenaPoolTestMapData::AthenaPoolTestMapData (const std::vector<Deposit>& deposi
     m_deposits = deposits;
 }
 
-AthenaPoolTestMapData::AthenaPoolTestMapData (const AthenaPoolTestMapData& other)
-    :m_word(other.m_word),
-     m_deposits(other.m_deposits)
-{}
-
-
 AthenaPoolTestMapData::~AthenaPoolTestMapData()
 {
     //    delete[] m_p_deposits;

AtlasTest/DatabaseTest/POOLCollectionToolsTest/test/run_CollUtils_xml

@@ -3,7 +3,7 @@
 DATADIR=/afs/cern.ch/atlas/offline/test/POOLCollectionTools
 XMLINPUT=$DATADIR/tagExtract_PUR.xml
 UTIL=CollAppend
-UTIL2=CollAppend.exe
+UTIL2=AthCollAppend
 
 # remove detritus from previous tests
 rm -f PoolCollectionCatalog.xml
@@ -24,7 +24,7 @@ fi
 cmd="$UTIL -xmlInput $XMLINPUT"
 echo $cmd
 #$cmd
-# Check Atlas version CollAppend
+# Check Atlas version AthCollAppend
 cmd="$UTIL2 -xmlInput $XMLINPUT"
 echo $cmd
 $cmd

AtlasTest/DatabaseTest/POOLCollectionToolsTest/test/tagExtract_PUR.xml

-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <!DOCTYPE ArgList>
 <ArgList>
 
-  <ToolInfo date="Tue Nov  9 18:49:00 2010&#xA;" toolID="CollAppend.exe">
+  <ToolInfo date="Tue Nov  9 18:49:00 2010&#xA;" toolID="AthCollAppend">
     <CliArg name="QueryInfo" option="-query">
       <datum/>
     <CliArg name="DstInfo" option="-dst">

AtlasTest/TestTools/CMakeLists.txt

+# $Id: CMakeLists.txt 744649 2016-05-03 19:33:39Z krasznaa $
 ################################################################################
 # Package: TestTools
 ################################################################################
@@ -6,25 +7,28 @@
 atlas_subdir( TestTools )
 
 # Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaCommon
-                          TestPolicy
-                          PRIVATE
-                          GaudiKernel )
+atlas_depends_on_subdirs(
+   PUBLIC
+   Control/AthenaCommon
+   TestPolicy
+   PRIVATE
+   GaudiKernel )
 
-# External dependencies:
-find_package( PythonLibs )
-
-# Component(s) in the package:
-atlas_add_library( TestTools
-                   src/*.cxx
-                   PUBLIC_HEADERS TestTools
-                   INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${PYTHON_LIBRARIES}
-                   PRIVATE_LINK_LIBRARIES GaudiKernel )
+# In standalone mode we just use the headers from the package. While in
+# offline mode we build a proper library.
+if( XAOD_STANDALONE )
+   atlas_add_library( TestTools
+      TestTools/*.h
+      INTERFACE
+      PUBLIC_HEADERS TestTools )
+else()
+   atlas_add_library( TestTools
+      TestTools/*.h src/*.cxx
+      PUBLIC_HEADERS TestTools
+      PRIVATE_LINK_LIBRARIES GaudiKernel )
+endif()
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
 atlas_install_scripts( share/runUnitTests.sh share/post.sh )
-

AtlasTest/TestTools/cmt/requirements

@@ -43,4 +43,3 @@ macro_append DOXYGEN_INPUT " ../doc"
 macro_append DOXYGEN_INPUT " ../share" 
 macro_append DOXYGEN_FILE_PATTERNS    " *.sh"
 macro_append DOXYGEN_FILE_PATTERNS    " *.txt"
-

AtlasTest/TestTools/share/post.sh

@@ -34,7 +34,8 @@ s/^StoreGateSvc_Impl   DEBUG/StoreGateSvc        DEBUG/
 s/StoreGateSvc_Impl/StoreGateSvc/
 s/SGImplSvc/StoreGateSvc/
 s/SG::DataProxyHolder::sgkey_t/sgkey_t/
-s!\\\\(ERROR\\\\|INFO\\\\|WARNING\\\\|FATAL\\\\) [^ ]*/!\\\\1 ../!
+s!(ERROR|INFO|WARNING|FATAL) [^ ]*/!\\\\1 ../!
+s/(\.cxx|\.cpp|\.h|\.icc|LINE):[0-9]+/\\\\1/
 s/.[[][?]1034h//
 EOF
 
@@ -145,6 +146,9 @@ PP="$PP"'|^ConditionStore +INFO Stop ConditionStore'
 # Differences between Gaudi versions.
 PP="$PP"'|DEBUG input handles:|DEBUG output handles:|DEBUG Data Deps for|DEBUG Property update for OutputLevel :|-ExtraInputs |-ExtraOutputs |-Cardinality |-IsClonable |-NeededResources |-Timeline '
 
+# StoreGate INFO messages changed to VERBOSE
+PP="$PP"'|^(StoreGateSvc|[^ ]+Store) +(INFO|VERBOSE) (Stop|stop|Start)'
+
 
 if [ "$extrapatterns" != "" ]; then
  PP="$PP""|$extrapatterns"
@@ -162,12 +166,36 @@ else
          echo "$GREEN post.sh> OK: ${test} exited normally. Output is in $joblog $RESET"
        fi
        reflog=../share/${test}.ref
+
+       # If we can't find the reference file, maybe it's located outside
+       # the repo.  With the switch to git, we have to fall back
+       # to handling the versioning manually.
+       # ATLAS_REFERENCE_TAG should be a string of the form PACKAGE/VERSION.
+       # We first look for it in DATAPATH.  If we don't find it,
+       # we then look under ATLAS_REFERENCE_DATA, which falls back
+       # to an afs path if it's not found.
+       if [ \( ! -r $reflog \) -a "$ATLAS_REFERENCE_TAG" != "" ]; then
+           # Look for the file in DATAPATH.
+           # We have to look for the directory, not the file itself,
+           # since get_files is hardcoded not to look more than two
+           # levels down.
+           get_files -data -symlink $ATLAS_REFERENCE_TAG > /dev/null
+           reflog=`basename $ATLAS_REFERENCE_TAG`/${test}.ref
+           if [ ! -r $reflog ]; then
+               testdata=$ATLAS_REFERENCE_DATA
+               if [ "$testdata" = "" ]; then
+                   testdata=/afs/cern.ch/atlas/maxidisk/d33/referencefiles
+               fi
+               reflog=$testdata/$ATLAS_REFERENCE_TAG/${test}.ref
+           fi
+       fi
+
        if [ -r $reflog ]
            then
 	   jobrep=${joblog}-rep
-	   sed "$II" $joblog > $jobrep
+	   sed -r "$II" $joblog > $jobrep
 	   refrep=`basename ${reflog}`-rep
-	   sed "$II" $reflog > $refrep
+	   sed -r "$II" $reflog > $refrep
            jobdiff=${joblog}-todiff
            refdiff=`basename ${reflog}`-todiff
            egrep -a -v "$PP" < $jobrep > $jobdiff

Build/AtlasBuildScripts/LCG_RELEASE_BASE.sh

+#
+# This helper script is meant to set up a valid value for the
+# LCG_RELEASE_BASE environment variable for the builds.
+#
+# If the environment variable is already set when the script runs, its
+# value is not modified. If it isn't set yet, then the script tries to
+# check for the existence of a number of standard directories in which
+# LCG releases usually reside.
+#
+
+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
+    echo "Set LCG_RELEASE_BASE = ${LCG_RELEASE_BASE}"
+
+else
+    echo "Leaving LCG_RELEASE_BASE = ${LCG_RELEASE_BASE}"
+fi

Build/AtlasBuildScripts/README.md

+Build Scripts For ATLAS External Projects
+=========================================
+
+This directory collects the helper scripts needed to build / set up everything
+necessary to build the projects of this repository.

Build/AtlasBuildScripts/TDAQ_RELEASE_BASE.sh

+#
+# This helper script is meant to set up a valid value for the
+# TDAQ_RELEASE_BASE environment variable for the builds.
+#
+# If the environment variable is already set when the script runs, its
+# value is not modified. If it isn't set yet, then the script tries to
+# check for the existence of a number of standard directories in which
+# TDAQ releases usually reside.
+#
+
+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
+    echo "Set TDAQ_RELEASE_BASE = ${TDAQ_RELEASE_BASE}"
+
+else
+    echo "Leaving TDAQ_RELEASE_BASE = ${TDAQ_RELEASE_BASE}"
+fi

Build/AtlasBuildScripts/build_Gaudi.sh

+#!/bin/bash
+#
+# Script used for building Gaudi.
+#
+
+# Don't stop on errors but count them
+set +e
+ERROR_COUNT=0
+
+# consider a pipe failed if ANY of the commands fails
+set -o pipefail
+
+# Function printing the usage information for the script
+usage() {
+    echo "Usage: build_Gaudi.sh <-s source dir> <-b build dir> " \
+        "<-i install dir> <-e externals dir> <-p externals project name> " \
+        "<-f platform name> [-r RPM dir] [-t build type]"
+}
+
+# Parse the command line arguments:
+SOURCEDIR=""
+BUILDDIR=""
+INSTALLDIR=""
+EXTDIR=""
+EXTPROJECT=""
+PLATFORM=""
+RPMDIR=""
+BUILDTYPE="Release"
+while getopts ":s:b:i:e:p:f:r:t:h" opt; do
+    case $opt in
+        s)
+            SOURCEDIR=$OPTARG
+            ;;
+        b)
+            BUILDDIR=$OPTARG
+            ;;
+        i)
+            INSTALLDIR=$OPTARG
+            ;;
+        e)
+            EXTDIR=$OPTARG
+            ;;
+        p)
+            EXTPROJECT=$OPTARG
+            ;;
+        f)
+            PLATFORM=$OPTARG
+            ;;
+        r)
+            RPMDIR=$OPTARG
+            ;;
+        t)
+            BUILDTYPE=$OPTARG
+            ;;
+        h)
+            usage
+            exit 0
+            ;;
+        :)
+            echo "Argument -$OPTARG requires a parameter!"
+            usage
+            exit 1
+            ;;
+        ?)
+            echo "Unknown argument: -$OPTARG"
+            usage
+            exit 1
+            ;;
+    esac
+done
+
+# Make sure that the required options were all specified:
+if [ "$SOURCEDIR" = "" ] || [ "$BUILDDIR" = "" ] || [ "$INSTALLDIR" = "" ] \
+    || [ "$EXTDIR" = "" ] || [ "$EXTPROJECT" = "" ] \
+    || [ "$PLATFORM" = "" ]; then
+    echo "Not all required parameters received!"
+    usage
+    exit 1
+fi
+
+# Create the build directory if it doesn't exist, and move to it:
+mkdir -p ${BUILDDIR} || ((ERROR_COUNT++))
+cd ${BUILDDIR} || ((ERROR_COUNT++))
+
+# Set up the externals project:
+source ${EXTDIR}/setup.sh || ((ERROR_COUNT++))
+
+#FIXME: simplify error counting below while keeping '| tee ...'
+
+# Configure the build:
+error_stamp=`mktemp .tmp.error.XXXXX` ; rm -f $error_stamp
+{
+cmake -DCMAKE_BUILD_TYPE:STRING=${BUILDTYPE} -DCTEST_USE_LAUNCHERS:BOOL=TRUE \
+    -DGAUDI_ATLAS:BOOL=TRUE -DGAUDI_ATLAS_BASE_PROJECT:STRING=${EXTPROJECT} \
+    -DCMAKE_INSTALL_PREFIX:PATH=/InstallArea/${PLATFORM} \
+    ${SOURCEDIR} || touch $error_stamp
+} 2>&1 | tee cmake_config.log 
+test -f $error_stamp && ((ERROR_COUNT++))
+rm -f $error_stamp
+
+# Build it:
+error_stamp=`mktemp .tmp.error.XXXXX` ; rm -f $error_stamp
+{
+make -k || touch $error_stamp
+} 2>&1 | tee cmake_build.log
+test -f $error_stamp && ((ERROR_COUNT++))
+rm -f $error_stamp
+
+
+# Install it:
+error_stamp=`mktemp .tmp.error.XXXXX` ; rm -f $error_stamp
+{
+make -k install/fast DESTDIR=${INSTALLDIR} || touch $error_stamp
+} 2>&1 | tee cmake_install.log
+test -f $error_stamp && ((ERROR_COUNT++))
+rm -f $error_stamp
+
+# If no RPM directory was specified, stop here:
+if [ "$RPMDIR" = "" ]; then
+    exit ${ERROR_COUNT}
+fi
+
+# Build the RPM for the project:
+error_stamp=`mktemp .tmp.error.XXXXX` ; rm -f $error_stamp
+{
+cpack || touch $error_stamp
+} 2>&1 | tee cmake_cpack.log
+test -f $error_stamp && ((ERROR_COUNT++))
+rm -f $error_stamp
+
+error_stamp=`mktemp .tmp.error.XXXXX` ; rm -f $error_stamp
+{
+mkdir -p ${RPMDIR} && cp GAUDI*.rpm ${RPMDIR} || touch $error_stamp
+} 2>&1 | tee cp_rpm.log
+test -f $error_stamp && ((ERROR_COUNT++))
+rm -f $error_stamp
+
+if [ $ERROR_COUNT -ne 0 ]; then
+	echo "Gaudi build script counted $ERROR_COUNT errors"
+fi
+
+exit ${ERROR_COUNT}

Build/AtlasBuildScripts/build_atlasexternals.sh

+#!/bin/bash
+#
+# Example script used for building one of the projects from the atlasexternals
+# repository.
+#
+
+# Don't stop on errors but count them
+set +e
+ERROR_COUNT=0
+
+# consider a pipe failed if ANY of the commands fails
+set -o pipefail
+
+# Function printing the usage information for the script
+usage() {
+    echo "Usage: build_atlasexternals.sh <-s source dir> <-b build dir> " \
+        "<-i install dir> [-p project] [-r RPM dir] [-t build type] [-l LCG version number]"
+}
+
+# Parse the command line arguments:
+SOURCEDIR=""
+BUILDDIR=""
+INSTALLDIR=""
+PROJECT="AthenaExternals"
+RPMDIR=""
+BUILDTYPE="Release"
+PROJECTVERSION=""
+LCGVERSION="88"
+while getopts ":s:b:i:p:r:t:v:l:h" opt; do
+    case $opt in
+        s)
+            SOURCEDIR=$OPTARG
+            ;;
+        b)
+            BUILDDIR=$OPTARG
+            ;;
+        i)
+            INSTALLDIR=$OPTARG
+            ;;
+        p)
+            PROJECT=$OPTARG
+            ;;
+        r)
+            RPMDIR=$OPTARG
+            ;;
+        t)
+            BUILDTYPE=$OPTARG
+            ;;
+        v)
+            PROJECTVERSION=$OPTARG
+            ;;
+        l)
+            LCGVERSION=$OPTARG
+            ;;
+        :)
+            echo "Argument -$OPTARG requires a parameter!"
+            usage
+            exit 1
+            ;;
+        ?)
+            echo "Unknown argument: -$OPTARG"
+            usage
+            exit 1
+            ;;
+    esac
+done
+
+# Make sure that the required options were all specified:
+if [ "$SOURCEDIR" = "" ] || [ "$BUILDDIR" = "" ] || [ "$INSTALLDIR" = "" ]; then
+    echo "Not all required parameters received!"
+    usage
+    exit 1
+fi
+
+# Create the build directory if it doesn't exist, and move to it:
+mkdir -p ${BUILDDIR} || ((ERROR_COUNT++))
+cd ${BUILDDIR} || ((ERROR_COUNT++))
+
+# Extra settings for providing a project version for the build if necessary:
+EXTRACONF=
+if [ "$PROJECTVERSION" != "" ]; then
+    PNAME=$(echo ${PROJECT} | awk '{print toupper($0)}')
+    EXTRACONF=-D${PNAME}_PROJECT_VERSION:STRING=${PROJECTVERSION}
+fi
+
+#FIXME: simplify error counting:
+
+
+# Configure the build:
+error_stamp=`mktemp .tmp.error.XXXXX` ; rm -f $error_stamp
+{
+ cmake -DCMAKE_BUILD_TYPE:STRING=${BUILDTYPE} -DCTEST_USE_LAUNCHERS:BOOL=TRUE \
+    -DLCG_VERSION_NUMBER:STRING=${LCGVERSION} \
+    ${EXTRACONF} \
+    ${SOURCEDIR}/Projects/${PROJECT}/ || touch $error_stamp
+} 2>&1 | tee cmake_config.log 
+test -f $error_stamp && ((ERROR_COUNT++)) 
+rm -f $error_stamp #FIXME: w/o $error_stamp one can't pass the status outside  { ... } | tee ... shell
+
+# Build it:
+error_stamp=`mktemp .tmp.error.XXXXX` ; rm -f $error_stamp
+{
+ make -k || touch $error_stamp
+} 2>&1 | tee cmake_build.log
+test -f $error_stamp && ((ERROR_COUNT++)) 
+rm -f $error_stamp 
+
+# Install it:
+error_stamp=`mktemp .tmp.error.XXXXX` ; rm -f $error_stamp
+{
+ make -k install/fast DESTDIR=${INSTALLDIR} || touch $error_stamp
+} 2>&1 | tee cmake_install.log
+test -f $error_stamp && ((ERROR_COUNT++)) 
+rm -f $error_stamp 
+ 
+
+# If no RPM directory was specified, stop here:
+if [ "$RPMDIR" = "" ]; then
+    exit ${ERROR_COUNT}
+fi
+
+# Build the RPM or other package for the project:
+error_stamp=`mktemp .tmp.error.XXXXX` ; rm -f $error_stamp
+{
+cpack || touch $error_stamp
+} 2>&1 | tee cmake_cpack.log
+test -f $error_stamp && ((ERROR_COUNT++)) 
+rm -f $error_stamp 
+    
+error_stamp=`mktemp .tmp.error.XXXXX` ; rm -f $error_stamp
+{
+ mkdir -p ${RPMDIR} && \
+ FILES=`ls ${PROJECT}*.rpm  ${PROJECT}*.tar.gz  ${PROJECT}*.dmg 2>/dev/null ; true ;` && \
+ test "X$FILES" != "X" && \
+ cp ${FILES} ${RPMDIR} || touch $error_stamp
+} 2>&1 | tee cp_rpm.log
+test -f $error_stamp && ((ERROR_COUNT++)) 
+rm -f $error_stamp 
+
+if [ $ERROR_COUNT -ne 0 ]; then
+	echo "AtlasExternals build script counted $ERROR_COUNT errors"
+fi
+
+exit ${ERROR_COUNT}

Build/AtlasBuildScripts/checkout_Gaudi.sh

+#!/bin/bash
+#
+# Script for automating the checkout of the Gaudi repository when
+# building the whole software stack in a nightly/release.
+#
+# The script must receive the tag/branch that should be checked out of the
+# Gaudi repository. And it can write the commit hash that the
+# checkout ended up with, into another file.
+#
+
+# Stop on errors:
+set -e
+
+# Function printing the usage information for the script
+usage() {
+    echo "Usage: checkout_Gaudi.sh [options]"
+    echo "  Options:"
+    echo "    -t branch/tag: Mandatory branch/tag/hash to check out"
+    echo "    -s directory: Mandatory source directory to use"
+    echo "    -e url: Optional source URL to use for the checkout"
+    echo
+    echo "  This script will allow the environment variables"
+    echo "  Gaudi_URL and Gaudi_REF to override"
+    echo "  other values (even those on the command line)"
+    echo "  If Gaudi_URL is set to 'current' then"
+	echo "  no clone or checkout is done and the working copy"
+	echo "  in the source directory is left untouched."
+}
+
+_max_retry_=5
+
+_retry_ () {
+    local cmd="$*"
+    local n=0
+    while ! $cmd ; do
+        if test $n -eq $_max_retry_ ; then
+            echo "ERROR: $cmd FAILED $_max_retry_ times. EXIT(1)" >&2
+            exit 1
+        fi
+        echo "WARNING: $cmd FAILED, retry in 30 sec ... "
+        sleep 30s
+        n=`expr $n + 1`
+    done
+}
+
+_max_retry_=5
+
+_retry_ () {
+    local cmd="$*"
+    local n=0
+    while ! $cmd ; do
+        if test $n -eq $_max_retry_ ; then
+            echo "ERROR: $cmd FAILED $_max_retry_ times. EXIT(1)" >&2
+            exit 1
+        fi
+        echo "WARNING: $cmd FAILED, retry in 30 sec ... "
+        sleep 30s
+        n=`expr $n + 1`
+    done
+}
+
+# Parse the command line arguments:
+TAGBRANCH=""
+SOURCEDIR=""
+GAUDIURL="https://gitlab.cern.ch/atlas/Gaudi.git"
+while getopts ":t:o:s:e:h" opt; do
+    case $opt in
+        t)
+            TAGBRANCH=$OPTARG
+            ;;
+        s)
+            SOURCEDIR=$OPTARG
+            ;;
+        e)
+            GAUDIURL=$OPTARG
+            ;;
+        h)
+            usage
+            exit 0
+            ;;
+        :)
+            echo "Argument -$OPTARG requires a parameter!"
+            usage
+            exit 1
+            ;;
+        ?)
+            echo "Unknown argument: -$OPTARG"
+            usage
+            exit 1
+            ;;
+    esac
+done
+
+if [ "$Gaudi_URL" != "" ]; then
+	GAUDIURL=$Gaudi_URL
+	echo "Gaudi URL overridden to $GAUDIURL from environment"
+	if [ "$Gaudi_URL" = "current" ]; then
+		echo "Leaving current checkout in place for build"
+		exit 0
+	fi 
+fi
+
+if [ "$Gaudi_REF" != "" ]; then
+	TAGBRANCH=$Gaudi_REF
+	echo "Gaudi ref overridden to $TAGBRANCH from environment"
+fi
+
+# The tag/branch and a source directory must have been specified:
+if [ "$TAGBRANCH" = "" ] || [ "$SOURCEDIR" = "" ]; then
+    echo "Not all required arguments were provided!"
+    usage
+    exit 1
+fi
+
+# Tell the user what will happen:
+echo "Checking out Gaudi tag/branch: $TAGBRANCH"
+echo "   from: $GAUDIURL"
+
+if [ ! -d "${SOURCEDIR}" ]; then
+    # Clone the repository:
+    _retry_ git clone ${GAUDIURL} ${SOURCEDIR}
+else
+    echo "${SOURCEDIR} already exists -> assume previous checkout"
+fi
+
+# Get the appropriate version of it:
+cd ${SOURCEDIR}
+_retry_ git fetch --prune origin
+_retry_ git checkout -f ${TAGBRANCH}

Build/AtlasBuildScripts/checkout_atlasexternals.sh

+#!/bin/bash
+#
+# Script for automating the checkout of the atlasexternals repository when
+# building the whole software stack in a nightly/release.
+#
+# The script must receive the tag/branch that should be checked out of the
+# atlasexternals repository. And it can write the commit hash that the
+# checkout ended up with, into another file.
+#
+
+# Stop on errors:
+set -e
+
+# Function printing the usage information for the script
+usage() {
+    echo "Usage: checkout_atlasexternals.sh [options]"
+    echo "  Options:"
+    echo "    -t branch/tag: Mandatory branch/tag/hash to check out"
+    echo "    -s directory: Mandatory source directory to use"
+    echo "    -e url: Optional source URL to use for the checkout"
+    echo
+    echo "  This script will allow the environment variables"
+    echo "  AtlasExternals_URL and AtlasExternals_REF to override"
+    echo "  other values (even those on the command line)."
+    echo "  If AtlasExternals_URL is set to 'current' then"
+	echo "  no clone or checkout is done and the working copy"
+	echo "  in the source directory is left untouched."
+}
+
+_max_retry_=5
+
+_retry_ () {
+    local cmd="$*"
+    local n=0
+    while ! $cmd ; do
+        if test $n -eq $_max_retry_ ; then
+            echo "ERROR: $cmd FAILED $_max_retry_ times. EXIT(1)" >&2
+            exit 1
+        fi
+        echo "WARNING: $cmd FAILED, retry in 30 sec ... "
+        sleep 30s
+        n=`expr $n + 1`
+    done
+}
+
+_max_retry_=5
+
+_retry_ () {
+    local cmd="$*"
+    local n=0
+    while ! $cmd ; do
+        if test $n -eq $_max_retry_ ; then
+            echo "ERROR: $cmd FAILED $_max_retry_ times. EXIT(1)" >&2
+            exit 1
+        fi
+        echo "WARNING: $cmd FAILED, retry in 30 sec ... "
+        sleep 30s
+        n=`expr $n + 1`
+    done
+}
+
+# Parse the command line arguments:
+TAGBRANCH=""
+SOURCEDIR=""
+EXTERNALSURL="https://gitlab.cern.ch/atlas/atlasexternals.git"
+while getopts ":t:o:s:e:h" opt; do
+    case $opt in
+        t)
+            TAGBRANCH=$OPTARG
+            ;;
+        s)
+            SOURCEDIR=$OPTARG
+            ;;
+        e)
+            EXTERNALSURL=$OPTARG
+            ;;
+        h)
+            usage
+            exit 0
+            ;;
+        :)
+            echo "Argument -$OPTARG requires a parameter!"
+            usage
+            exit 1
+            ;;
+        ?)
+            echo "Unknown argument: -$OPTARG"
+            usage
+            exit 1
+            ;;
+    esac
+done
+
+if [ "$AtlasExternals_URL" != "" ]; then
+	EXTERNALSURL=$AtlasExternals_URL
+	echo "Externals URL overridden to $EXTERNALSURL from environment"
+	if [ "$AtlasExternals_URL" = "current" ]; then
+		echo "Leaving current checkout in place for build"
+		exit 0
+	fi 
+fi
+
+if [ "$AtlasExternals_REF" != "" ]; then
+	TAGBRANCH=$AtlasExternals_REF
+	echo "Externals ref overridden to $TAGBRANCH from environment"
+fi
+
+# The tag/branch and a source directory must have been specified:
+if [ "$TAGBRANCH" = "" ] || [ "$SOURCEDIR" = "" ]; then
+    echo "Not all required arguments were provided!"
+    usage
+    exit 1
+fi
+
+# Tell the user what will happen:
+echo "Checking out atlasexternals tag/branch: $TAGBRANCH"
+echo "   from: $EXTERNALSURL"
+
+if [ ! -d "${SOURCEDIR}" ]; then
+    # Clone the repository:
+    _retry_ git clone ${EXTERNALSURL} ${SOURCEDIR}
+else
+    echo "${SOURCEDIR} already exists -> assume previous checkout"
+fi
+
+# Get the appropriate version of it:
+cd ${SOURCEDIR}
+_retry_ git fetch --prune origin
+_retry_ git checkout -f ${TAGBRANCH}

Build/AtlasBuildScripts/copy_rpm_eos.sh

+#!/bin/bash
+#
+# Script to copy local nightly RPMs to EOS and run createrepo
+#
+
+ERROR_COUNT=0
+
+# Function printing the usage information for the script
+usage() {
+    echo "Usage: copy_rpm_eos.sh <-b branch> <-a arch> <-d week_day> <-s source dir> " 
+	echo "copy_rpm_eos.sh -b 22.0.X -a x86_64-slc6-gcc49-opt -s /build2/atnight/localbuilds/nightlies/22.0.X-GIT/build"
+
+}
+
+# Parse the command line arguments
+BRANCH=""
+ARCH=""
+SOURCEDIR=""
+WEEKDAY=""
+DESTDIR="/eos/project/a/atlas-software-dist/www/RPMs/nightlies"
+
+while getopts ":b:a:s:d:" opt; do
+	case $opt in
+	    b)
+			BRANCH=$OPTARG
+			;;
+		a) 
+			ARCH=$OPTARG
+			;;
+		s)
+			SOURCEDIR=$OPTARG
+			;;
+		d)
+			WEEKDAY=$OPTARG
+			;;
+			
+		:)
+			echo "Argument -$OPTARG requires a parameter!"
+            usage
+            exit 1
+            ;;
+        ?)
+            echo "Unknown argument: -$OPTARG"
+            usage
+            exit 1
+            ;;
+    esac
+done
+# Make sure that the required options were all specified:
+if  [ "$BRANCH" = "" ] || [ "$ARCH" = "" ] || [ "$SOURCEDIR" = "" ] ; then
+    echo "Not all required parameters received!"
+    usage
+    exit 1
+fi
+
+if [ "$WEEKDAY" = "" ]; then
+   DDAY=rel_`date +%w`
+else 
+   DDAY=${WEEKDAY}
+fi
+
+echo "====================================================="
+echo "=== STARTING RPMs copy to /eos at `date`"
+echo "====================================================="
+
+
+DESTDIR=${DESTDIR}/${BRANCH}/${ARCH}/${DDAY}
+
+_retry_() {
+    local cmd="$*" dt=16 retr=0
+    while ! $cmd ; do
+        if test $retr -ge 6 ; then
+            echo "ERROR: 6 retries of $cmd FAILED ... " >&2
+            return 1
+        fi
+        echo "WARNING: $cmd failed, waiting $dt sec ..."
+        sleep ${dt}s
+        dt=`expr $dt + $dt`
+        retr=`expr $retr + 1`
+    done
+    return 0
+}
+
+if [ ! -d ${DESTDIR} ] ; then 
+   echo "mkdir -p ${DESTDIR}"
+   _retry_ mkdir -p ${DESTDIR} 
+   if [ ! -d ${DESTDIR} ] ; then ((ERROR_COUNT++)) ; fi  #avoid false positive eos error if the directory was actually created
+fi
+
+echo "====================================================="
+echo "=== Create repodata on local machine"
+echo "====================================================="
+echo "nicos_rpm::::::: createrepo --workers 8 --update ${SOURCEDIR} :::::::" `date`
+createrepo --workers 8 --update ${SOURCEDIR} || ((ERROR_COUNT++))
+
+arr_rpm=(`(shopt -s nocaseglob; ls ${SOURCEDIR}/*.rpm)`)
+if [ "${#arr_rpm[@]}" -le 0 ]; then
+   echo "nicos_rpm: Warning: no rpm files are found in ${SOURCEDIR}"
+   ((ERROR_COUNT++))
+ else
+   for ele in "${arr_rpm[@]}" 
+   do
+      echo "Info: copying $ele to ${DESTDIR}"                                                 
+      _retry_ cp -a $ele ${DESTDIR} || ((ERROR_COUNT++))
+   done
+fi 
+
+echo "====================================================="
+echo "=== Copy repodata to nightly eos location"
+echo "====================================================="
+echo "Info: copying ${SOURCEDIR}/repodata to ${DESTDIR}" 
+_retry_ cp -a -rf ${SOURCEDIR}/repodata ${DESTDIR} || ((ERROR_COUNT++))
+
+exit ${ERROR_COUNT}