From 38760d65b801ce9f92a50c94e05199bd87f9f223 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Wed, 27 May 2020 13:47:46 +0000
Subject: [PATCH] Revert "Merge branch 'build_ext' into 'master'"
This reverts merge request !32965
---
Projects/AthGeneration/build_externals.sh | 13 -------------
Projects/AthSimulation/build_externals.sh | 13 -------------
Projects/Athena/build_externals.sh | 13 -------------
3 files changed, 39 deletions(-)
diff --git a/Projects/AthGeneration/build_externals.sh b/Projects/AthGeneration/build_externals.sh
index 94536827037..012de3d5cac 100755
--- a/Projects/AthGeneration/build_externals.sh
+++ b/Projects/AthGeneration/build_externals.sh
@@ -95,17 +95,6 @@ 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}
@@ -209,7 +198,5 @@ ${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}
diff --git a/Projects/AthSimulation/build_externals.sh b/Projects/AthSimulation/build_externals.sh
index 1b15d6e1a68..5e3c9d5dd1c 100755
--- a/Projects/AthSimulation/build_externals.sh
+++ b/Projects/AthSimulation/build_externals.sh
@@ -87,17 +87,6 @@ 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}
@@ -158,7 +147,5 @@ ${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}
diff --git a/Projects/Athena/build_externals.sh b/Projects/Athena/build_externals.sh
index 70a84287621..9d3c98d6701 100755
--- a/Projects/Athena/build_externals.sh
+++ b/Projects/Athena/build_externals.sh
@@ -95,17 +95,6 @@ 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}
@@ -209,7 +198,5 @@ ${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}
--
GitLab