Print this page
4027 remove CLOSED_BUILD
@@ -891,34 +891,19 @@
fi
}
#
# Verify that the closed tree is present if it needs to be.
-# Sets CLOSED_IS_PRESENT for future use.
#
function check_closed_tree {
- if [ -z "$CLOSED_IS_PRESENT" ]; then
- if [ -d $CODEMGR_WS/usr/closed ]; then
- CLOSED_IS_PRESENT="yes"
- else
- CLOSED_IS_PRESENT="no"
- fi
- export CLOSED_IS_PRESENT
- fi
- if [[ "$CLOSED_IS_PRESENT" = no && ! -d "$ON_CLOSED_BINS" ]]; then
- #
- # If it's an old (pre-split) tree or an empty
- # workspace, don't complain.
- #
- if grep -s CLOSED_BUILD $SRC/Makefile.master > /dev/null; then
+ if [[ ! -d "$ON_CLOSED_BINS" ]]; then
echo "If the closed sources are not present," \
"ON_CLOSED_BINS"
echo "must point to the closed binaries tree."
build_ok=n
exit 1
fi
- fi
}
function obsolete_build {
echo "WARNING: Obsolete $1 build requested; request will be ignored"
}