Commit 47627fdd authored by James Byrne's avatar James Byrne Committed by ROOL
Browse files

Make the !Common.sh mk function exit on an error

Detail:
The mk function had the bad habit of hiding failed builds by always
returning an exit code of zero. It will now exit with 1 on a failure.

Version 1.44. Tagged as 'Env-1_44'
parent b7e58533
......@@ -110,16 +110,16 @@ mk ()
fi
RELPATH=$(echo "${COMPONENTDIR#*$BUILDDIR/}" | tr / .)
MYTMP=$(mktemp)
if [ -n "$COMPONENT" ]; then
grep "^$COMPONENT " "$BUILDDIR/BuildSys/ModuleDB" > "$MYTMP"
else
grep "$RELPATH\( \|$\)" "$BUILDDIR/BuildSys/ModuleDB" > "$MYTMP"
fi
if [ $? -ne 0 ]; then
# Component not found in ModuleDB - can't infer anything
make -C "$COMPONENTDIR" "$@"
make -C "$COMPONENTDIR" "$@" || { rm "$MYTMP"; exit 1; }
else
while read -r DB_COMPONENT _ _ DB_INSTDIR DB_TARGET; do
ARGS=""
......@@ -132,7 +132,7 @@ mk ()
if [ -z "$INSTDIR" ] && [ -n "$DB_INSTDIR" ]; then
ARGS="$ARGS INSTDIR=\"$INSTALLDIR/$DB_INSTDIR\""
fi
make -C "$COMPONENTDIR" $ARGS "$@"
make -C "$COMPONENTDIR" $ARGS "$@" || { rm "$MYTMP"; exit 1; }
done < "$MYTMP"
fi
rm "$MYTMP"
......
/* (1.43)
/* (1.44)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 1.43
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 28 Mar 2020
#define Module_MajorVersion_CMHG 1.44
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 26 May 2020
#define Module_MajorVersion "1.43"
#define Module_Version 143
#define Module_MajorVersion "1.44"
#define Module_Version 144
#define Module_MinorVersion ""
#define Module_Date "28 Mar 2020"
#define Module_Date "26 May 2020"
#define Module_ApplicationDate "28-Mar-20"
#define Module_ApplicationDate "26-May-20"
#define Module_ComponentName "Env"
#define Module_FullVersion "1.43"
#define Module_HelpVersion "1.43 (28 Mar 2020)"
#define Module_LibraryVersionInfo "1:43"
#define Module_FullVersion "1.44"
#define Module_HelpVersion "1.44 (26 May 2020)"
#define Module_LibraryVersionInfo "1:44"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment