Update of /cvsroot/linux-vax/toolchain/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15307
Modified Files:
build_toolchain.sh
Log Message:
- Rework command logging to better fit Kenn's needs (at least, I hope so).
- Remove empty arguments for `echo'.
Index: build_toolchain.sh
===================================================================
RCS file: /cvsroot/linux-vax/toolchain/scripts/build_toolchain.sh,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- build_toolchain.sh 5 Jan 2006 18:20:07 -0000 1.56
+++ build_toolchain.sh 5 Jan 2006 19:41:13 -0000 1.57
@@ -60,10 +60,14 @@
#
TARGET="vax-linux-uclibc"
+function current_utc_time() {
+ date -u '+%Y%m%d-%H%M%S-UTC'
+}
+
#
# General configuration
#
-NOW="`date -u '+%Y%m%d-%H%M%S'`"
+NOW="`current_utc_time`"
DO_TIMESTAMP_BINUTILS=0
DO_TIMESTAMP_GCC=0
DO_TIMESTAMP_GLIBC=0
@@ -311,6 +315,9 @@
#
# $1... - command (with its arguments) to execute
#
+# If you want to grep for the commands executed (and the timestamps of
+# execution), grep for '^#-St'.
+#
function execute() {
local RETVAL
local RESTART_LOOP
@@ -324,21 +331,12 @@
fi
while [ "${RESTART_LOOP}" -le "${RESTART_MAX}" ]; do
- echo "#"
- echo "#"
- echo "# `date`: Executing in `pwd` (run ${RESTART_LOOP}/${RESTART_MAX}):"
- echo "# $*"
- echo "#"
- echo "#"
-
+ echo "#-Start at `current_utc_time` in `pwd` (run ${RESTART_LOOP}/${RESTART_MAX}): $*"
set +e
"$@"
RETVAL=$?
set -e
-
- echo "#"
- echo "# `date`: End of: $*"
- echo "#"
+ echo "#-Stop at `date` with ret=${RETVAL} in `pwd`: $*"
echo
if [ "${RETVAL}" -eq 0 ]; then
@@ -459,12 +457,12 @@
#
# Copy pristine sources
#
-echo -n "`date`: " ; copy_directory.sh "${BINUTILS_CVS}" "${BINUTILS_SRC}" ${CVS_OMIT_DIR}
-echo -n "`date`: " ; copy_directory.sh "${GLIBC_PORTS_CVS}" "${GLIBC_SRC}" ${CVS_OMIT_DIR}
-echo -n "`date`: " ; copy_directory.sh "${GLIBC_CVS}" "${GLIBC_SRC}" ${CVS_OMIT_DIR}
-echo -n "`date`: " ; copy_directory.sh "${GCC_CVS}" "${GCC_SRC}" ${SVN_OMIT_DIR}
-echo -n "`date`: " ; copy_directory.sh "${LINUX_CVS}" "${LINUX_SRC}" ${CVS_OMIT_DIR}
-echo -n "`date`: " ; copy_directory.sh "${UCLIBC_SVN}" "${UCLIBC_SRC}" ${SVN_OMIT_DIR}
+execute copy_directory.sh "${BINUTILS_CVS}" "${BINUTILS_SRC}" ${CVS_OMIT_DIR}
+execute copy_directory.sh "${GLIBC_PORTS_CVS}" "${GLIBC_SRC}" ${CVS_OMIT_DIR}
+execute copy_directory.sh "${GLIBC_CVS}" "${GLIBC_SRC}" ${CVS_OMIT_DIR}
+execute copy_directory.sh "${GCC_CVS}" "${GCC_SRC}" ${SVN_OMIT_DIR}
+execute copy_directory.sh "${LINUX_CVS}" "${LINUX_SRC}" ${CVS_OMIT_DIR}
+execute copy_directory.sh "${UCLIBC_SVN}" "${UCLIBC_SRC}" ${SVN_OMIT_DIR}
#
# Possibly force specific CVS timestamps
@@ -686,9 +684,9 @@
# compiler based on glibc...
#
execute ${MAKE} || true
- echo "" >&2
+ echo >&2
echo "WARNING: This build is was faked to be okay" >&2
- echo "" >&2
+ echo >&2
exit 0
popd
fi
|
