From 3961f3d554a2ac9f6d0477ffb0dc539e7842d676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Wed, 22 Nov 2017 20:55:13 +0000 Subject: build.sh:-R: always print/don't print std{out,err} logs for failed packages. build.sh:-vv: always print/don't print stdout logs for successfully built packages. subr/ex_rtl_fileop.subr:ex_build_fileop(): log at vvvo (-vvv.) subr/ex_rtl_log.subr, vars/env.vars: removes [vw]arn, separates info & {vnfo,vvfo,vvvo}. var/env.vars:${CLEAR_ENV_VARS_EXCEPT}: adds ARG_VERBOSE[23]. --- build.sh | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index bfd435d6..d26ab7d3 100755 --- a/build.sh +++ b/build.sh @@ -16,19 +16,27 @@ for BUILD_TARGET_META in invariants ${BUILD_TARGETS_META:-world}; do BUILD_PACKAGES="$(ex_lfilter "${BUILD_PACKAGES}" "${BUILD_PACKAGES_RESTART}")"; fi; for PKG_NAME in ${BUILD_PACKAGES}; do - ex_log_msg vnfo "Starting \`${PKG_NAME}' build..."; + ex_log_msg info "Starting \`${PKG_NAME}' build..."; ex_pkg_dispatch "${BUILD_TARGET}" "${PKG_NAME}" \ "${ARG_RESTART}" "${ARG_RESTART_AT}"; BUILD_SCRIPT_RC=${?}; case ${BUILD_SCRIPT_RC} in - 0) ex_log_msg succ "Finished \`${PKG_NAME}' build."; - : $((BUILD_NFINI+=1)); continue; ;; - *) ex_log_msg fail "Build failed in \`${PKG_NAME}', check \`${WORKDIR}/${PKG_NAME}_std{err,out}.log' for details."; - : $((BUILD_NFAIL+=1)); - if [ ${ARG_RELAXED:-0} -eq 1 ]; then + 0) : $((BUILD_NFINI+=1)); + if [ "${ARG_VERBOSE2:-0}" -eq 1 ]; then + cat "${WORKDIR}/${PKG_NAME}_stdout.log"; + fi; + ex_log_msg succ "Finished \`${PKG_NAME}' build."; ;; + *) : $((BUILD_NFAIL+=1)); + if [ "${ARG_RELAXED:-0}" -eq 1 ]; then + ex_log_msg fail "Build failed in \`${PKG_NAME}', check \`${WORKDIR}/${PKG_NAME}_std{err,out}.log' for details."; BUILD_PKGS_FAILED="${BUILD_PKGS_FAILED:+${BUILD_PKGS_FAILED} }${PKG_NAME}"; continue; else + ex_log_msg fail "${WORKDIR}/${PKG_NAME}_stdout.log:"; + cat "${WORKDIR}/${PKG_NAME}_stdout.log"; + ex_log_msg fail "${WORKDIR}/${PKG_NAME}_stderr.log:"; + cat "${WORKDIR}/${PKG_NAME}_stderr.log"; + ex_log_msg fail "Build failed in \`${PKG_NAME}'."; break; fi; ;; esac; -- cgit v1.2.3