Use CT_DoExecLog when building tools and debug utilities.
/trunk/scripts/build/tools/200-sstrip.sh | 12 6 6 0 ++++++------
/trunk/scripts/build/debug/100-dmalloc.sh | 10 5 5 0 +++++-----
/trunk/scripts/build/debug/400-ltrace.sh | 5 3 2 0 +++--
/trunk/scripts/build/debug/300-gdb.sh | 30 17 13 0 +++++++++++++++++-------------
/trunk/scripts/build/debug/500-strace.sh | 7 4 3 0 ++++---
/trunk/scripts/build/debug/200-duma.sh | 5 3 2 0 +++--
6 files changed, 38 insertions(+), 31 deletions(-)
1.1 --- a/scripts/build/debug/100-dmalloc.sh Mon Jul 14 21:56:58 2008 +0000
1.2 +++ b/scripts/build/debug/100-dmalloc.sh Mon Jul 14 21:57:57 2008 +0000
1.3 @@ -40,19 +40,19 @@
1.4
1.5 LD="${CT_TARGET}-ld" \
1.6 AR="${CT_TARGET}-ar" \
1.7 + CT_DoExecLog ALL \
1.8 "${CT_SRC_DIR}/dmalloc-${CT_DMALLOC_VERSION}/configure" \
1.9 --prefix=/usr \
1.10 --build="${CT_BUILD}" \
1.11 --host="${CT_TARGET}" \
1.12 - ${extra_config} 2>&1 |CT_DoLog ALL
1.13 + ${extra_config}
1.14
1.15 CT_DoLog EXTRA "Building dmalloc"
1.16 - make 2>&1 |CT_DoLog ALL
1.17 + CT_DoExecLog ALL make 2>&1 |CT_DoLog ALL
1.18
1.19 CT_DoLog EXTRA "Installing dmalloc"
1.20 - make DESTDIR="${CT_SYSROOT_DIR}" installincs \
1.21 - installlib 2>&1 |CT_DoLog ALL
1.22 - make DESTDIR="${CT_DEBUG_INSTALL_DIR}" installutil 2>&1 |CT_DoLog ALL
1.23 + CT_DoExecLog ALL make DESTDIR="${CT_SYSROOT_DIR}" installincs installlib
1.24 + CT_DoExecLog ALL make DESTDIR="${CT_DEBUG_INSTALL_DIR}" installutil
1.25
1.26 CT_EndStep
1.27 }
2.1 --- a/scripts/build/debug/200-duma.sh Mon Jul 14 21:56:58 2008 +0000
2.2 +++ b/scripts/build/debug/200-duma.sh Mon Jul 14 21:57:57 2008 +0000
2.3 @@ -43,15 +43,16 @@
2.4 [ "${CT_DUMA_SO}" = "y" ] && libs="${libs} ${duma_so}"
2.5 libs="${libs# }"
2.6 CT_DoLog EXTRA "Building libraries '${libs}'"
2.7 + CT_DoExecLog ALL \
2.8 make HOSTCC="${CT_CC_NATIVE}" \
2.9 HOSTCXX="${CT_CC_NATIVE}" \
2.10 CC="${CT_TARGET}-gcc" \
2.11 CXX="${CT_TARGET}-gcc" \
2.12 RANLIB="${CT_TARGET}-ranlib" \
2.13 DUMA_CPP="${DUMA_CPP}" \
2.14 - ${libs} 2>&1 |CT_DoLog ALL
2.15 + ${libs}
2.16 CT_DoLog EXTRA "Installing libraries '${libs}'"
2.17 - install -m 644 ${libs} "${CT_SYSROOT_DIR}/usr/lib" 2>&1 |CT_DoLog ALL
2.18 + CT_DoExecLog ALL install -m 644 ${libs} "${CT_SYSROOT_DIR}/usr/lib"
2.19 if [ "${CT_DUMA_SO}" = "y" ]; then
2.20 CT_DoLog EXTRA "Installing shared library link"
2.21 ln -vsf ${duma_so} "${CT_SYSROOT_DIR}/usr/lib/libduma.so" 2>&1 |CT_DoLog ALL
3.1 --- a/scripts/build/debug/300-gdb.sh Mon Jul 14 21:56:58 2008 +0000
3.2 +++ b/scripts/build/debug/300-gdb.sh Mon Jul 14 21:57:57 2008 +0000
3.3 @@ -71,19 +71,20 @@
3.4
3.5 CC="${CC_for_gdb}" \
3.6 LD="${LD_for_gdb}" \
3.7 + CT_DoExecLog ALL \
3.8 "${gdb_src_dir}/configure" \
3.9 --build=${CT_BUILD} \
3.10 --host=${CT_HOST} \
3.11 --target=${CT_TARGET} \
3.12 --prefix="${CT_PREFIX_DIR}" \
3.13 --with-build-sysroot="${CT_SYSROOT_DIR}" \
3.14 - ${cross_extra_config} 2>&1 |CT_DoLog ALL
3.15 + ${cross_extra_config}
3.16
3.17 CT_DoLog EXTRA "Building cross-gdb"
3.18 - make ${PARALLELMFLAGS} 2>&1 |CT_DoLog ALL
3.19 + CT_DoExecLog ALL make ${PARALLELMFLAGS}
3.20
3.21 CT_DoLog EXTRA "Installing cross-gdb"
3.22 - make install 2>&1 |CT_DoLog ALL
3.23 + CT_DoExecLog ALL make install
3.24
3.25 CT_EndStep
3.26 fi
3.27 @@ -100,6 +101,7 @@
3.28 [ "${CT_CC_LANG_CXX}" = "y" ] || ncurses_opts="${ncurses_opts} --without-cxx --without-cxx-binding"
3.29 [ "${CT_CC_LANG_ADA}" = "y" ] || ncurses_opts="${ncurses_opts} --without-ada"
3.30
3.31 + CT_DoExecLog ALL \
3.32 "${CT_SRC_DIR}/ncurses-${CT_NCURSES_VERSION}/configure" \
3.33 --build=${CT_BUILD} \
3.34 --host=${CT_TARGET} \
3.35 @@ -111,14 +113,14 @@
3.36 --without-sysmouse \
3.37 --without-progs \
3.38 --enable-termcap \
3.39 - ${ncurses_opts} 2>&1 |CT_DoLog ALL
3.40 + ${ncurses_opts}
3.41
3.42 CT_DoLog EXTRA "Building ncurses"
3.43 - make ${PARALLELMFLAGS} 2>&1 |CT_DoLog ALL
3.44 + CT_DoExecLog ALL make ${PARALLELMFLAGS}
3.45
3.46 CT_DoLog EXTRA "Installing ncurses"
3.47 - mkdir -p -v "${CT_SYSROOT_DIR}/usr/bin" 2>&1 |CT_DoLog ALL
3.48 - make DESTDIR="${CT_SYSROOT_DIR}" install 2>&1 |CT_DoLog ALL
3.49 + mkdir -p "${CT_SYSROOT_DIR}/usr/bin"
3.50 + CT_DoExecLog ALL make DESTDIR="${CT_SYSROOT_DIR}" install
3.51
3.52 CT_EndStep
3.53
3.54 @@ -150,6 +152,7 @@
3.55
3.56 CC="${CC_for_gdb}" \
3.57 LD="${LD_for_gdb}" \
3.58 + CT_DoExecLog ALL \
3.59 "${gdb_src_dir}/configure" \
3.60 --build=${CT_BUILD} \
3.61 --host=${CT_TARGET} \
3.62 @@ -164,13 +167,13 @@
3.63 --disable-werror \
3.64 --without-included-gettext \
3.65 --without-develop \
3.66 - ${native_extra_config} 2>&1 |CT_DoLog ALL
3.67 + ${native_extra_config}
3.68
3.69 CT_DoLog EXTRA "Building native gdb"
3.70 - make ${PARALLELMFLAGS} CC=${CT_TARGET}-${CT_CC} 2>&1 |CT_DoLog ALL
3.71 + CT_DoExecLog ALL make ${PARALLELMFLAGS} CC=${CT_TARGET}-${CT_CC}
3.72
3.73 CT_DoLog EXTRA "Installing native gdb"
3.74 - make DESTDIR="${CT_DEBUG_INSTALL_DIR}" install 2>&1 |CT_DoLog ALL
3.75 + CT_DoExecLog ALL make DESTDIR="${CT_DEBUG_INSTALL_DIR}" install
3.76
3.77 # Building a native gdb also builds a gdbserver
3.78 find "${CT_DEBUG_INSTALL_DIR}" -type f -name gdbserver -exec rm -fv {} + 2>&1 |CT_DoLog ALL
3.79 @@ -200,6 +203,7 @@
3.80 gdbserver_extra_config="${extra_config}"
3.81
3.82 LDFLAGS="${gdbserver_LDFLAGS}" \
3.83 + CT_DoExecLog ALL \
3.84 "${gdb_src_dir}/gdb/gdbserver/configure" \
3.85 --build=${CT_BUILD} \
3.86 --host=${CT_TARGET} \
3.87 @@ -216,13 +220,13 @@
3.88 --without-x \
3.89 --without-included-gettext \
3.90 --without-develop \
3.91 - ${gdbserver_extra_config} 2>&1 |CT_DoLog ALL
3.92 + ${gdbserver_extra_config}
3.93
3.94 CT_DoLog EXTRA "Building gdbserver"
3.95 - make ${PARALLELMFLAGS} CC=${CT_TARGET}-${CT_CC} 2>&1 |CT_DoLog ALL
3.96 + CT_DoExecLog ALL make ${PARALLELMFLAGS} CC=${CT_TARGET}-${CT_CC}
3.97
3.98 CT_DoLog EXTRA "Installing gdbserver"
3.99 - make DESTDIR="${CT_DEBUG_INSTALL_DIR}" install 2>&1 |CT_DoLog ALL
3.100 + CT_DoExecLog ALL make DESTDIR="${CT_DEBUG_INSTALL_DIR}" install
3.101
3.102 CT_EndStep
3.103 fi
4.1 --- a/scripts/build/debug/400-ltrace.sh Mon Jul 14 21:56:58 2008 +0000
4.2 +++ b/scripts/build/debug/400-ltrace.sh Mon Jul 14 21:57:57 2008 +0000
4.3 @@ -27,16 +27,17 @@
4.4 CT_DoLog EXTRA "Configuring ltrace"
4.5 # CFLAGS="-I${CT_SYSROOT_DIR}/usr/include" \
4.6 # LDFLAGS="-L${CT_SYSROOT_DIR}/usr/include" \
4.7 + CT_DoExecLog ALL \
4.8 "${CT_SRC_DIR}/ltrace-${CT_LTRACE_VERSION}/configure" \
4.9 --build=${CT_BUILD} \
4.10 --host=${CT_TARGET} \
4.11 --prefix=/usr
4.12
4.13 CT_DoLog EXTRA "Building ltrace"
4.14 - make
4.15 + CT_DoExecLog ALL make
4.16
4.17 CT_DoLog EXTRA "Installing ltrace"
4.18 - make DESTDIR="${CT_DEBUG_INSTALL_DIR}" install
4.19 + CT_DoExecLog ALL make DESTDIR="${CT_DEBUG_INSTALL_DIR}" install
4.20
4.21 CT_Popd
4.22 CT_EndStep
5.1 --- a/scripts/build/debug/500-strace.sh Mon Jul 14 21:56:58 2008 +0000
5.2 +++ b/scripts/build/debug/500-strace.sh Mon Jul 14 21:57:57 2008 +0000
5.3 @@ -21,16 +21,17 @@
5.4 CT_Pushd "${CT_BUILD_DIR}/build-strace"
5.5
5.6 CT_DoLog EXTRA "Configuring strace"
5.7 + CT_DoExecLog ALL \
5.8 "${CT_SRC_DIR}/strace-${CT_STRACE_VERSION}/configure" \
5.9 --build=${CT_BUILD} \
5.10 --host=${CT_TARGET} \
5.11 - --prefix=/usr 2>&1 |CT_DoLog ALL
5.12 + --prefix=/usr
5.13
5.14 CT_DoLog EXTRA "Building strace"
5.15 - make 2>&1 |CT_DoLog ALL
5.16 + CT_DoExecLog ALL make
5.17
5.18 CT_DoLog EXTRA "Installing strace"
5.19 - make DESTDIR="${CT_DEBUG_INSTALL_DIR}" install 2>&1 |CT_DoLog ALL
5.20 + CT_DoExecLog ALL make DESTDIR="${CT_DEBUG_INSTALL_DIR}" install
5.21
5.22 CT_Popd
5.23 CT_EndStep
6.1 --- a/scripts/build/tools/200-sstrip.sh Mon Jul 14 21:56:58 2008 +0000
6.2 +++ b/scripts/build/tools/200-sstrip.sh Mon Jul 14 21:57:57 2008 +0000
6.3 @@ -21,10 +21,10 @@
6.4 ( cd "${CT_SRC_DIR}/ELFkickers-${CT_SSTRIP_ELFKICKERS_VERSION}/sstrip"; tar cf - . ) |tar xf -
6.5
6.6 CT_DoLog EXTRA "Building sstrip"
6.7 - make CC="${CT_CC_NATIVE}" sstrip 2>&1 |CT_DoLog ALL
6.8 + CT_DoExecLog ALL make CC="${CT_CC_NATIVE}" sstrip
6.9
6.10 CT_DoLog EXTRA "Installing sstrip"
6.11 - install -m 755 sstrip "${CT_PREFIX_DIR}/bin/${CT_TARGET}-sstrip" 2>&1 |CT_DoLog ALL
6.12 + CT_DoExecLog ALL install -m 755 sstrip "${CT_PREFIX_DIR}/bin/${CT_TARGET}-sstrip"
6.13
6.14 CT_EndStep
6.15 }
6.16 @@ -60,14 +60,14 @@
6.17 mv -v sstrip.c?* sstrip.c 2>&1 |CT_DoLog DEBUG
6.18 if [ "${CT_SAVE_TARBALLS}" = "y" ]; then
6.19 CT_DoLog EXTRA "Saving 'sstrip.c' to local storage"
6.20 - cp -v sstrip.c "${CT_LOCAL_TARBALLS_DIR}" 2>&1 |CT_DoLog DEBUG
6.21 + CT_DoExecLog ALL cp -v sstrip.c "${CT_LOCAL_TARBALLS_DIR}"
6.22 fi
6.23 CT_Popd
6.24 }
6.25 do_tools_sstrip_extract() {
6.26 # We'll let buildroot guys take care of sstrip maintenance and patching.
6.27 mkdir -p "${CT_SRC_DIR}/sstrip"
6.28 - cp -v "${CT_TARBALLS_DIR}/sstrip.c" "${CT_SRC_DIR}/sstrip" |CT_DoLog ALL
6.29 + CT_DoExecLog ALL cp -v "${CT_TARBALLS_DIR}/sstrip.c" "${CT_SRC_DIR}/sstrip"
6.30 }
6.31 do_tools_sstrip_build() {
6.32 CT_DoStep INFO "Installing sstrip"
6.33 @@ -75,10 +75,10 @@
6.34 cd "${CT_BUILD_DIR}/build-sstrip"
6.35
6.36 CT_DoLog EXTRA "Building sstrip"
6.37 - ${CT_CC_NATIVE} -Wall -o sstrip "${CT_SRC_DIR}/sstrip/sstrip.c" 2>&1 |CT_DoLog ALL
6.38 + CT_DoExecLog ALL ${CT_CC_NATIVE} -Wall -o sstrip "${CT_SRC_DIR}/sstrip/sstrip.c"
6.39
6.40 CT_DoLog EXTRA "Installing sstrip"
6.41 - install -m 755 sstrip "${CT_PREFIX_DIR}/bin/${CT_TARGET}-sstrip" 2>&1 |CT_DoLog ALL
6.42 + CT_DoExecLog ALL install -m 755 sstrip "${CT_PREFIX_DIR}/bin/${CT_TARGET}-sstrip"
6.43
6.44 CT_EndStep
6.45 }