Skip to content
Snippets Groups Projects
Commit c102e67e authored by Adam Edward Barton's avatar Adam Edward Barton
Browse files

Merge branch 'build_ext' into 'master'

Reuse existing externals build if possible

Closes ATLINFR-3018

See merge request atlas/athena!32965
parents c386dd0f c362b220
No related branches found
No related tags found
No related merge requests found
......@@ -95,6 +95,17 @@ if [ "$FORCE" = "1" ]; then
rm -fr ${BUILDDIR}/build/AthGenerationExternals ${BUILDDIR}/build/GAUDI
fi
# Check if previous externals build can be reused:
externals_stamp=${BUILDDIR}/build/AthGenerationExternals/${BINARY_TAG}/externals.stamp
if [ -f ${externals_stamp} ]; then
if diff -q ${externals_stamp} ${thisdir}/externals.txt; then
echo "Correct version of externals already available in ${BUILDDIR}"
exit 0
else
rm ${externals_stamp}
fi
fi
# Create some directories:
mkdir -p ${BUILDDIR}/{src,install}
......@@ -198,5 +209,7 @@ ${scriptsdir}/build_Gaudi.sh \
# Exit with the error count taken into account.
if [ ${ERROR_COUNT} -ne 0 ]; then
echo "AthGeneration externals build encountered ${ERROR_COUNT} error(s)"
else
cp ${thisdir}/externals.txt ${externals_stamp}
fi
exit ${ERROR_COUNT}
......@@ -87,6 +87,17 @@ if [ "$FORCE" = "1" ]; then
rm -fr ${BUILDDIR}/build/AthSimulationExternals ${BUILDDIR}/build/GAUDI
fi
# Check if previous externals build can be reused:
externals_stamp=${BUILDDIR}/build/AthSimulationExternals/${BINARY_TAG}/externals.stamp
if [ -f ${externals_stamp} ]; then
if diff -q ${externals_stamp} ${thisdir}/externals.txt; then
echo "Correct version of externals already available in ${BUILDDIR}"
exit 0
else
rm ${externals_stamp}
fi
fi
# Create some directories:
mkdir -p ${BUILDDIR}/{src,install}
......@@ -147,5 +158,7 @@ ${scriptsdir}/build_Gaudi.sh \
# Exit with the error count taken into account.
if [ ${ERROR_COUNT} -ne 0 ]; then
echo "AthSimulation externals build encountered ${ERROR_COUNT} error(s)"
else
cp ${thisdir}/externals.txt ${externals_stamp}
fi
exit ${ERROR_COUNT}
......@@ -95,6 +95,17 @@ if [ "$FORCE" = "1" ]; then
rm -fr ${BUILDDIR}/build/AthenaExternals ${BUILDDIR}/build/GAUDI
fi
# Check if previous externals build can be reused:
externals_stamp=${BUILDDIR}/build/AthenaExternals/${BINARY_TAG}/externals.stamp
if [ -f ${externals_stamp} ]; then
if diff -q ${externals_stamp} ${thisdir}/externals.txt; then
echo "Correct version of externals already available in ${BUILDDIR}"
exit 0
else
rm ${externals_stamp}
fi
fi
# Create some directories:
mkdir -p ${BUILDDIR}/{src,install}
......@@ -198,5 +209,7 @@ ${scriptsdir}/build_Gaudi.sh \
# Exit with the error count taken into account.
if [ ${ERROR_COUNT} -ne 0 ]; then
echo "Athena externals build encountered ${ERROR_COUNT} error(s)"
else
cp ${thisdir}/externals.txt ${externals_stamp}
fi
exit ${ERROR_COUNT}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment