diff --git a/Projects/AthDataQuality/CMakeLists.txt b/Projects/AthDataQuality/CMakeLists.txt index 46a0abb1c81491f948f61c4e1479b24f470b7ba9..bc60c4d2608a5f82bd14a87365fb314279833c75 100644 --- a/Projects/AthDataQuality/CMakeLists.txt +++ b/Projects/AthDataQuality/CMakeLists.txt @@ -18,7 +18,7 @@ set( TDAQ-COMMON_ATROOT find_package( AtlasCMake REQUIRED ) # Build the project against LCG: -set( LCG_VERSION_POSTFIX "" +set( LCG_VERSION_POSTFIX "a" CACHE STRING "Version postfix for the LCG release to use" ) set( LCG_VERSION_NUMBER 97 CACHE STRING "Version number for the LCG release to use" ) diff --git a/Projects/AthGeneration/build_externals.sh b/Projects/AthGeneration/build_externals.sh index ce567fe02c130c158fbf315ed565bb0f5fdfd724..4de9824dc2459e96da1775051adee5ca20d87d2e 100755 --- a/Projects/AthGeneration/build_externals.sh +++ b/Projects/AthGeneration/build_externals.sh @@ -24,7 +24,7 @@ BUILDDIR="" BUILDTYPE="RelWithDebInfo" FORCE="" CI="" -EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="") +EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="a") while getopts ":t:b:x:fch" opt; do case $opt in t) @@ -73,10 +73,10 @@ thisdir=$(cd ${thisdir};pwd) # Go to the main directory of the repository: cd ${thisdir}/../.. -{ +{ test "X${NIGHTLY_STATUS}" != "X" && { scriptsdir_nightly_status=${NIGHTLY_STATUS_SCRIPTS} - test "X$scriptsdir_nightly_status" = "X" && scriptsdir_nightly_status=${scriptsdir}/nightly_status + test "X$scriptsdir_nightly_status" = "X" && scriptsdir_nightly_status=${scriptsdir}/nightly_status test -x $scriptsdir_nightly_status/externals_status_on_exit.sh && trap $scriptsdir_nightly_status/externals_status_on_exit.sh EXIT } } @@ -132,7 +132,7 @@ AthGenerationExternalsVersion=$(awk '/^AthGenerationExternalsVersion/{print $3}' ${scriptsdir}/checkout_atlasexternals.sh \ -t ${AthGenerationExternalsVersion} \ -s ${BUILDDIR}/src/AthGenerationExternals 2>&1 | \ - tee ${BUILDDIR}/src/checkout.AthGenerationExternals.log + tee ${BUILDDIR}/src/checkout.AthGenerationExternals.log # log analyzer never affects return status in the parent shell: { @@ -140,10 +140,10 @@ ${scriptsdir}/checkout_atlasexternals.sh \ branch=$(basename $(cd .. ; pwd)) #FIXME: should be taken from env. timestamp_tmp=` basename ${BUILDDIR}/../.@@__* 2>/dev/null | sed 's,^\.,,' ` #to be used until the final stamp from ReleaseData is available test "X$timestamp_tmp" != "X" || { - timestamp_tmp=@@__`date "+%Y-%m-%dT%H%M"`__@@ + timestamp_tmp=@@__`date "+%Y-%m-%dT%H%M"`__@@ touch ${BUILDDIR}/../.${timestamp_tmp} } - (set +e + (set +e ${scriptsdir_nightly_status}/checkout_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" AthGenerationExternals ${BUILDDIR}/src/checkout.AthGenerationExternals.log ) } || true @@ -160,9 +160,9 @@ ${scriptsdir}/build_atlasexternals.sh \ { test "X${NIGHTLY_STATUS}" != "X" && { - (set +e - ${scriptsdir_nightly_status}/cmake_config_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" AthGenerationExternals ${BUILDDIR}/build/AthGenerationExternals/cmake_config.log - ${scriptsdir_nightly_status}/cmake_build_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" AthGenerationExternals ${BUILDDIR}/build/AthGenerationExternals/cmake_build.log + (set +e + ${scriptsdir_nightly_status}/cmake_config_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" AthGenerationExternals ${BUILDDIR}/build/AthGenerationExternals/cmake_config.log + ${scriptsdir_nightly_status}/cmake_build_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" AthGenerationExternals ${BUILDDIR}/build/AthGenerationExternals/cmake_build.log ) } || true } @@ -180,7 +180,7 @@ ${scriptsdir}/checkout_Gaudi.sh \ -s ${BUILDDIR}/src/GAUDI 2>&1 | tee ${BUILDDIR}/src/checkout.GAUDI.log { - test "X${NIGHTLY_STATUS}" != "X" && { + test "X${NIGHTLY_STATUS}" != "X" && { (set +e ${scriptsdir_nightly_status}/checkout_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" GAUDI ${BUILDDIR}/src/checkout.GAUDI.log ) @@ -200,8 +200,8 @@ ${scriptsdir}/build_Gaudi.sh \ { test "X${NIGHTLY_STATUS}" != "X" && { (set +e - ${scriptsdir_nightly_status}/cmake_config_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" GAUDI ${BUILDDIR}/build/GAUDI/cmake_config.log - ${scriptsdir_nightly_status}/cmake_build_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" GAUDI ${BUILDDIR}/build/GAUDI/cmake_build.log + ${scriptsdir_nightly_status}/cmake_config_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" GAUDI ${BUILDDIR}/build/GAUDI/cmake_config.log + ${scriptsdir_nightly_status}/cmake_build_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" GAUDI ${BUILDDIR}/build/GAUDI/cmake_build.log ) } || true } diff --git a/Projects/AthSimulation/build_externals.sh b/Projects/AthSimulation/build_externals.sh index da06fa2d0fe961468a6e60fccb187dd0b67e20b2..7638a095be2b147662dab458fdef5343ae352b54 100755 --- a/Projects/AthSimulation/build_externals.sh +++ b/Projects/AthSimulation/build_externals.sh @@ -24,7 +24,7 @@ BUILDDIR="" BUILDTYPE="RelWithDebInfo" FORCE="" CI="" -EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="") +EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="a") while getopts ":t:b:x:fch" opt; do case $opt in t) diff --git a/Projects/Athena/CMakeLists.txt b/Projects/Athena/CMakeLists.txt index 42958c9bddf44a8e2fe269842645d0fabfb03cda..2403fa9c7198c93101b3db7cdadb3beebd949f4f 100644 --- a/Projects/Athena/CMakeLists.txt +++ b/Projects/Athena/CMakeLists.txt @@ -31,9 +31,9 @@ if( LCG_NIGHTLY ) set( TDAQ_VERSION "99-00-00" CACHE STRING "The version of tdaq to use for the build" ) else() - set( TDAQ-COMMON_VERSION "04-00-00" CACHE STRING + set( TDAQ-COMMON_VERSION "04-01-01" CACHE STRING "The version of tdaq-common to use for the build" ) - set( TDAQ_VERSION "09-00-00" CACHE STRING + set( TDAQ_VERSION "09-01-01" CACHE STRING "The version of tdaq to use for the build" ) endif() diff --git a/Projects/Athena/build_externals.sh b/Projects/Athena/build_externals.sh index 6ad6ab29730792933233bb800793540a868ac83f..76c1c06bfda4594b2f931e393e117dd83c9155de 100755 --- a/Projects/Athena/build_externals.sh +++ b/Projects/Athena/build_externals.sh @@ -24,7 +24,7 @@ BUILDDIR="" BUILDTYPE="RelWithDebInfo" FORCE="" CI="" -EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="") +EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="a") while getopts ":t:b:x:fch" opt; do case $opt in t) @@ -73,10 +73,10 @@ thisdir=$(cd ${thisdir};pwd) # Go to the main directory of the repository: cd ${thisdir}/../.. -{ +{ test "X${NIGHTLY_STATUS}" != "X" && { scriptsdir_nightly_status=${NIGHTLY_STATUS_SCRIPTS} - test "X$scriptsdir_nightly_status" = "X" && scriptsdir_nightly_status=${scriptsdir}/nightly_status + test "X$scriptsdir_nightly_status" = "X" && scriptsdir_nightly_status=${scriptsdir}/nightly_status test -x $scriptsdir_nightly_status/externals_status_on_exit.sh && trap $scriptsdir_nightly_status/externals_status_on_exit.sh EXIT } } @@ -131,7 +131,7 @@ AthenaExternalsVersion=$(awk '/^AthenaExternalsVersion/{print $3}' ${thisdir}/ex # Check out AthenaExternals from the right branch/tag: ${scriptsdir}/checkout_atlasexternals.sh \ -t ${AthenaExternalsVersion} \ - -s ${BUILDDIR}/src/AthenaExternals 2>&1 | tee ${BUILDDIR}/src/checkout.AthenaExternals.log + -s ${BUILDDIR}/src/AthenaExternals 2>&1 | tee ${BUILDDIR}/src/checkout.AthenaExternals.log # log analyzer never affects return status in the parent shell: { @@ -139,10 +139,10 @@ ${scriptsdir}/checkout_atlasexternals.sh \ branch=$(basename $(cd .. ; pwd)) #FIXME: should be taken from env. timestamp_tmp=` basename ${BUILDDIR}/../.@@__* 2>/dev/null | sed 's,^\.,,' ` #to be used until the final stamp from ReleaseData is available test "X$timestamp_tmp" != "X" || { - timestamp_tmp=@@__`date "+%Y-%m-%dT%H%M"`__@@ + timestamp_tmp=@@__`date "+%Y-%m-%dT%H%M"`__@@ touch ${BUILDDIR}/../.${timestamp_tmp} } - (set +e + (set +e ${scriptsdir_nightly_status}/checkout_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" AthenaExternals ${BUILDDIR}/src/checkout.AthenaExternals.log ) } || true @@ -160,9 +160,9 @@ ${scriptsdir}/build_atlasexternals.sh \ { test "X${NIGHTLY_STATUS}" != "X" && { - (set +e - ${scriptsdir_nightly_status}/cmake_config_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" AthenaExternals ${BUILDDIR}/build/AthenaExternals/cmake_config.log - ${scriptsdir_nightly_status}/cmake_build_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" AthenaExternals ${BUILDDIR}/build/AthenaExternals/cmake_build.log + (set +e + ${scriptsdir_nightly_status}/cmake_config_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" AthenaExternals ${BUILDDIR}/build/AthenaExternals/cmake_config.log + ${scriptsdir_nightly_status}/cmake_build_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" AthenaExternals ${BUILDDIR}/build/AthenaExternals/cmake_build.log ) } || true } @@ -180,7 +180,7 @@ ${scriptsdir}/checkout_Gaudi.sh \ -s ${BUILDDIR}/src/GAUDI 2>&1 | tee ${BUILDDIR}/src/checkout.GAUDI.log { - test "X${NIGHTLY_STATUS}" != "X" && { + test "X${NIGHTLY_STATUS}" != "X" && { (set +e ${scriptsdir_nightly_status}/checkout_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" GAUDI ${BUILDDIR}/src/checkout.GAUDI.log ) @@ -200,8 +200,8 @@ ${scriptsdir}/build_Gaudi.sh \ { test "X${NIGHTLY_STATUS}" != "X" && { (set +e - ${scriptsdir_nightly_status}/cmake_config_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" GAUDI ${BUILDDIR}/build/GAUDI/cmake_config.log - ${scriptsdir_nightly_status}/cmake_build_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" GAUDI ${BUILDDIR}/build/GAUDI/cmake_build.log + ${scriptsdir_nightly_status}/cmake_config_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" GAUDI ${BUILDDIR}/build/GAUDI/cmake_config.log + ${scriptsdir_nightly_status}/cmake_build_status.sh "$branch" "$BINARY_TAG" "$timestamp_tmp" GAUDI ${BUILDDIR}/build/GAUDI/cmake_build.log ) } || true } diff --git a/Projects/VP1Light/build_externals.sh b/Projects/VP1Light/build_externals.sh index 4b83f43b313b6841ff8599a7418ea5a6a561824e..dc4fb97d27944b1d597adfff97336a0ee8f9cdad 100755 --- a/Projects/VP1Light/build_externals.sh +++ b/Projects/VP1Light/build_externals.sh @@ -26,7 +26,7 @@ BUILDDIR="" BUILDTYPE="RelWithDebInfo" FORCE="" CI="" -EXTRACMAKE=() +EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="a") while getopts ":t:b:fch" opt; do case $opt in t)