From fc9417f077a909539495531229f9035c15fe10f0 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?= <lucio@lucioillanes.de>
Date: Wed, 22 Nov 2017 16:00:55 +0000
Subject: build.sh, subr/ex_pkg_dispatch.subr: splits build logging and job
 control logic. subr/ex_pkg_dispatch.subr: dispatch background jobs w/
 redirected std{err,out} & FIFO. subr/ex_pkg_state.subr:ex_pkg_state_init():
 trap(1) signals to abort build. vars/{gcc,musl}.vars: don't exit(1) from
 within package subroutine.

---
 build.sh | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index c54400ac..a834a929 100755
--- a/build.sh
+++ b/build.sh
@@ -3,10 +3,10 @@
 #
 
 for __ in $(find subr -name *.subr); do . "${__}"; done;
-ex_setup_args "${@}"; ex_setup_env; ex_setup_checks; ex_setup_subdirs;
-ex_pkg_state_init; {(
+ex_setup_args "${@}"; ex_setup_env; ex_setup_checks; ex_setup_subdirs; ex_pkg_state_init;
 ex_log_msg info "Build started by ${BUILD_USER:=${USER}}@${BUILD_HNAME:=$(hostname)} at ${BUILD_DATE_START}.";
 ex_log_env_vars "build (global)" ${LOG_ENV_VARS};
+
 for BUILD_TARGET_META in invariants ${BUILD_TARGETS_META:-world}; do
 	for BUILD_TARGET_LC in $(ex_get_var_unsafe "$(ex_toupper "${BUILD_TARGET_META}")_TARGET"); do
 		BUILD_TARGET="$(ex_toupper "${BUILD_TARGET_LC}")";
@@ -16,38 +16,36 @@ 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_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}' (last return code ${BUILD_SCRIPT_RC}.).";
-				: $((BUILD_NFAIL+=1));
-				if [ ${ARG_RELAXED:-0} -eq 1 ]; then
-					BUILD_PKGS_FAILED="${BUILD_PKGS_FAILED:+${BUILD_PKGS_FAILED} }${PKG_NAME}";
-					continue;
-				else
-					break;
-				fi;
+			   : $((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
+			   BUILD_PKGS_FAILED="${BUILD_PKGS_FAILED:+${BUILD_PKGS_FAILED} }${PKG_NAME}";
+				continue;
+			   else
+				break;
+			   fi; ;;
 			esac;
 		done;
 		if [ "${BUILD_SCRIPT_RC:-0}" -ne 0 ]; then
 			break;
 		fi;
 	done;
-done; ex_pkg_state_fini;
+done;
+
+ex_pkg_state_fini;
 ex_log_msg info "${BUILD_NFINI} finished, ${BUILD_NSKIP} skipped, and ${BUILD_NFAIL} failed builds in ${BUILD_NBUILT} build script(s).";
 ex_log_msg info "Build time: ${BUILD_TIMES_HOURS} hour(s), ${BUILD_TIMES_MINUTES} minute(s), and ${BUILD_TIMES_SECS} second(s).";
 if [ ${ARG_RELAXED:-0} -eq 1 ]\
 && [ -n "${BUILD_PKGS_FAILED}" ]; then
 	ex_log_msg info "Build script failure(s) in: ${BUILD_PKGS_FAILED}.";
 fi;
-exit "${BUILD_SCRIPT_RC:-0}")} 2>&1 | tee "${BUILD_LOG_FNAME}" & TEE_PID="${!}";
-
-trap "rm -f ${BUILD_STATUS_IN_PROGRESS_FNAME};	\
-	ex_log_msg fail \"Build aborted.\";	\
-	echo kill ${TEE_PID};			\
-	kill ${TEE_PID}" HUP INT TERM USR1 USR2; wait;
+exit "${BUILD_SCRIPT_RC:-0}"
 
 # vim:filetype=sh
-- 
cgit v1.2.3