socsvn commit: r238480 - soc2012/scher/par_ports/head/Mk

[scher at FreeBSD.org]

Author: scher
Date: Thu Jun 28 15:31:42 2012
New Revision: 238480
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238480

Log:
  [user_feedback] redesign of user feedback in XXX-depends targets
  

Modified:
  soc2012/scher/par_ports/head/Mk/bsd.parallel.mk
  soc2012/scher/par_ports/head/Mk/bsd.port.mk

Modified: soc2012/scher/par_ports/head/Mk/bsd.parallel.mk
==============================================================================
--- soc2012/scher/par_ports/head/Mk/bsd.parallel.mk	Thu Jun 28 14:26:55 2012	(r238479)
+++ soc2012/scher/par_ports/head/Mk/bsd.parallel.mk	Thu Jun 28 15:31:42 2012	(r238480)
@@ -396,6 +396,13 @@
 # 							  tuples of all currently being processed ports,
 #							  spawned by this make process.
 #
+_parv_PRINT_ACTIVE_BUILDS= \
+	${ECHO_CMD} "     Currently building dependency ports are"; \
+	for build in $$( ${ECHO_CMD} "$${active_builds}" ); do \
+		dir=$${build\#\#*:}; \
+		${ECHO_CMD} "         $$(cd $${dir}; ${MAKE} -V PKGNAME)"; \
+	done
+
 _PROCESS_ACTIVE_BUILDS= \
 	enable_feedback=${_parv_ON_LOCK_FEEDBACK_TIMEOUT}; \
 	while true; do \
@@ -450,11 +457,7 @@
 				else \
 					${ECHO_CMD} "     No dependencies to spawn. All remaining dependencies are building now."; \
 				fi; \
-				${ECHO_CMD} "     Currently building dependency ports are"; \
-				for build in $$( ${ECHO_CMD} "$${active_builds}" ); do \
-					dir=$${build\#\#*:}; \
-					${ECHO_CMD} "         $$(cd $${dir}; ${MAKE} -V PKGNAME)"; \
-				done; \
+				${_parv_PRINT_ACTIVE_BUILDS}; \
 				enable_feedback=0; \
 			fi; \
 			enable_feedback=$$(( $${enable_feedback} + 1 )); \

Modified: soc2012/scher/par_ports/head/Mk/bsd.port.mk
==============================================================================
--- soc2012/scher/par_ports/head/Mk/bsd.port.mk	Thu Jun 28 14:26:55 2012	(r238479)
+++ soc2012/scher/par_ports/head/Mk/bsd.port.mk	Thu Jun 28 15:31:42 2012	(r238480)
@@ -1511,6 +1511,7 @@
 .endif
 
 _PROCESS_ACTIVE_BUILDS?= ${DO_NADA}
+_parv_PRINT_ACTIVE_BUILDS?= ${DO_NADA}
 
 .if !target(lock-port-dbdir)
 lock-port-dbdir:
@@ -5124,14 +5125,8 @@
 	depends=`${ECHO_CMD} "${${deptype}_DEPENDS}"`; \
 	depends=$$( echo "$${depends}" | sed 's/^[[:space:]]*//' | sed 's/[[:space:]]*$$//' ); \
 	active_builds=""; \
-	echo "----   dependency output  ----- : ----------START BUILDING DEPS---------- "; \
-	echo "----   dependency output  ----- : ALL DEPS - $${depends}"; \
 	while [ $${#depends} -ne 0 ]; do \
 		i=$${depends%% *}; \
-		echo "----   dependency output  ----- : ----- NEW STEP -----" ; \
-		echo "----   dependency output  -----  DEPS TO BUILD _$${depends}_" ; \
-		echo "----   dependency output  -----  ACTIVE BUILDS _$${active_builds}_" ; \
-		echo "----   dependency output  -----  CURRENT DEP $${i}" ; \
 		prog=$${i%%:*}; \
 		if [ -z "$$prog" ]; then \
 			${ECHO_MSG} "Error: there is an empty port dependency in ${deptype}_DEPENDS."; \
@@ -5219,8 +5214,7 @@
 			( cd $${dir}; ${MAKE} check-lock ) || { \
 			status=$$?; \
 			if [ $${status} -eq ${_parv_MAKE_LOCK_EXIT_STATUS} ]; then \
-				echo "----   dependency output  ----- :  LOCKED $${i}" ; \
-				${ECHO_CMD} $${prog} may be installing now.; \
+				${ECHO_CMD} "===>   $${prog} may be installing now"; \
 				notfound=${_parv_ON_LOCK_EXIT_STATUS}; \
 			else \
 				exit $${status}; \
@@ -5237,30 +5231,23 @@
 			else \
 				${_INSTALL_DEPENDS} \
 				if [ $${spawned} ]; then \
-					echo "----   dependency output  ----- : SPAWNED PID $${spawned}"; \
 					active_builds="$${active_builds} $${spawned}:$${i}"; \
 					depends="$${depends%%$${i}*} $${depends##*$${i}}"; \
 					depends=$$( echo "$${depends}" | sed 's/^[[:space:]]*//' | sed 's/[[:space:]]*$$//' ); \
 					spawned=""; \
-					echo "----   dependency output  ----- : ADD TO ACTIVE BUILDS _$${active_builds}_" ; \
-					echo "----   dependency output  ----- : AFTER TRANSFER TO ACTIVE BUILDS _$${depends}_" ; \
+					${_parv_PRINT_ACTIVE_BUILDS}; \
 				fi; \
 			fi; \
 		elif [ $${notfound} -eq 0 ]; then \
 			depends="$${depends%%$${i}*} $${depends##*$${i}}"; \
 			depends=$$( echo "$${depends}" | sed 's/^[[:space:]]*//' | sed 's/[[:space:]]*$$//' ); \
-			echo "----   dependency output  ----- : AFTER FROM DEPS DELETE _$${depends}_" ; \
 		elif [ $${notfound} -eq ${_parv_ON_LOCK_EXIT_STATUS} ]; then \
 			if [ $$( ${ECHO_CMD} $${depends} | wc -w ) -gt 1 ]; then \
 				depends="$${depends#* } $${depends%% *}"; \
 				depends=$$( echo "$${depends}" | sed 's/^[[:space:]]*//' | sed 's/[[:space:]]*$$//' ); \
-				echo "----   dependency output  ----- : AFTER  ROUND CHANGE $${depends}" ; \
 			fi; \
 		fi; \
 		${_PROCESS_ACTIVE_BUILDS}; \
-		echo "----   dependency output  ----- : ----- END OF STEP -----" ; \
-		echo "----   dependency output  -----  DEPS TO BUILD _$${depends}_" ; \
-		echo "----   dependency output  -----  ACTIVE BUILDS _$${active_builds}_" ; \
 	done
 .endif
 .else
@@ -5276,14 +5263,8 @@
 	depends=`${ECHO_CMD} "${LIB_DEPENDS}"`; \
 	depends=$$( echo "$${depends}" | sed 's/^[[:space:]]*//' | sed 's/[[:space:]]*$$//' ); \
 	active_builds=""; \
-	echo "----   dependency output  ----- : ----------START BUILDING LIB DEPS---------- "; \
-	echo "----   dependency output  ----- : ALL DEPS - $${depends}"; \
 	while [ $${#depends} -ne 0 ]; do \
 		i=$${depends%% *}; \
-		echo "----   dependency output  ----- : ----- NEW STEP -----" ; \
-		echo "----   dependency output  -----  DEPS TO BUILD _$${depends}_" ; \
-		echo "----   dependency output  -----  ACTIVE BUILDS _$${active_builds}_" ; \
-		echo "----   dependency output  -----  CURRENT DEP $${i}" ; \
 		lib=$${i%%:*}; \
 		pattern="`${ECHO_CMD} $$lib | ${SED} -E -e 's/\./\\\\./g' -e 's/(\\\\)?\+/\\\\+/g'`"\
 		dir=$${i#*:}; \
@@ -5314,8 +5295,7 @@
 			( cd $${dir}; ${MAKE} check-lock ) || { \
 			status=$$?; \
 			if [ $${status} -eq ${_parv_MAKE_LOCK_EXIT_STATUS} ]; then \
-				echo "----   dependency output  ----- :  LOCKED $${i}" ; \
-				${ECHO_CMD} $${lib} may be installing now.; \
+				${ECHO_CMD} "===>   $${lib} may be installing now"; \
 				notfound=${_parv_ON_LOCK_EXIT_STATUS}; \
 			else \
 				exit $${status}; \
@@ -5338,30 +5318,23 @@
 					fi; \
 				fi; \
 				if [ $${spawned} ]; then \
-					echo "----   dependency output  ----- : SPAWNED PID $${spawned}"; \
 					active_builds="$${active_builds} $${spawned}:$${i}"; \
 					depends="$${depends%%$${i}*} $${depends##*$${i}}"; \
 					depends=$$( echo "$${depends}" | sed 's/^[[:space:]]*//' | sed 's/[[:space:]]*$$//' ); \
 					spawned=""; \
-					echo "----   dependency output  ----- : ADD TO ACTIVE BUILDS _$${active_builds}_" ; \
-					echo "----   dependency output  ----- : AFTER TRANSFER TO ACTIVE BUILDS _$${depends}_" ; \
+					${_parv_PRINT_ACTIVE_BUILDS}; \
 				fi; \
 			fi; \
 		elif [ $${notfound} -eq 0 ]; then \
 			depends="$${depends%%$${i}*} $${depends##*$${i}}"; \
 			depends=$$( echo "$${depends}" | sed 's/^[[:space:]]*//' | sed 's/[[:space:]]*$$//' ); \
-			echo "----   dependency output  ----- : AFTER FROM DEPS DELETE _$${depends}_" ; \
 		elif [ $${notfound} -eq ${_parv_ON_LOCK_EXIT_STATUS} ]; then \
 			if [ $$( ${ECHO_CMD} $${depends} | wc -w ) -gt 1 ]; then \
 				depends="$${depends#* } $${depends%% *}"; \
 				depends=$$( echo "$${depends}" | sed 's/^[[:space:]]*//' | sed 's/[[:space:]]*$$//' ); \
-				echo "----   dependency output  ----- : AFTER  ROUND CHANGE $${depends}" ; \
  			fi; \
  		fi; \
  		${_PROCESS_ACTIVE_BUILDS}; \
-		echo "----   dependency output  ----- : ----- END OF STEP -----" ; \
-		echo "----   dependency output  -----  DEPS TO BUILD _$${depends}_" ; \
-		echo "----   dependency output  -----  ACTIVE BUILDS _$${active_builds}_" ; \
 	done
 .endif