Date: Thu, 28 Jun 2012 11:07:36 +0000 From: scher@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r238466 - soc2012/scher/par_ports/head/Mk Message-ID: <20120628110736.DF9B11065675@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: scher Date: Thu Jun 28 11:07:36 2012 New Revision: 238466 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238466 Log: [user_feedback][new_feature] stdout and stderr streams of port's deps are redirected to special log files. [user_feedback] more clear output in ${_PROCESS_ACTIVE_BUILDS}(not final version) 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 10:40:57 2012 (r238465) +++ soc2012/scher/par_ports/head/Mk/bsd.parallel.mk Thu Jun 28 11:07:36 2012 (r238466) @@ -147,7 +147,7 @@ _parv_PORT_DBDIR_LOCK_FILE= .lock _parv_LOCK_DIR_LOCK_FILE= ${PKGNAME} # TODO: docs is needed -_parv_PORT_LOG_FILE= ${PKGNAME} +_parv_PORT_LOG_FILE= $$(cd $$dir; ${MAKE} -V PKGNAME)-spawned-by-pid${.MAKE.PID}.log _parv_WAIT_FOR_LOCK_TIME?= 5 _parv_WAIT_FOR_UNLOCK_TIME?= 15 @@ -449,8 +449,11 @@ done; \ if { [ $${builds_num} -eq ${_parv_PARALLEL_BUILDS_NUMBER} ] || \ ( [ $${builds_num} -gt 0 ] && [ $${\#depends} -eq 0 ] ); }; then \ - if [ ${_parv_WANT_PARALLEL_BUILD} ]; then \ - echo "---- dependency output ----- : CAN'T SPAWN MORE DEPS! SLEEP... "; \ + echo "---- dependency output ----- : CAN'T SPAWN MORE DEPS! SLEEP... "; \ + if [ $${builds_num} -eq ${_parv_PARALLEL_BUILDS_NUMBER} ]; then \ + echo ${_parv_PARALLEL_BUILDS_NUMBER} is maximum number of parallel build; \ + else \ + echo No dependencies to spawn. All remaining dependencies are building; \ fi; \ sleep ${CHECK_ACTIVE_TIMEOUT}; \ fi; \ Modified: soc2012/scher/par_ports/head/Mk/bsd.port.mk ============================================================================== --- soc2012/scher/par_ports/head/Mk/bsd.port.mk Thu Jun 28 10:40:57 2012 (r238465) +++ soc2012/scher/par_ports/head/Mk/bsd.port.mk Thu Jun 28 11:07:36 2012 (r238466) @@ -5083,7 +5083,11 @@ fi; \ else \ if [ ${_parv_WANT_PARALLEL_BUILD} ]; then \ - (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args ) & spawned=$$!; \ + log_file=${_parv_PORTS_LOGS_DIR}/${_parv_PORT_LOG_FILE}; \ + ( \ + cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args \ + > $${log_file} 2> $${log_file} \ + ) & spawned=$$!; \ else \ (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args); \ spawned="yes"; \ @@ -5091,7 +5095,11 @@ fi; \ else \ if [ ${_parv_WANT_PARALLEL_BUILD} ]; then \ - (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args ) & spawned=$$!; \ + log_file=${_parv_PORTS_LOGS_DIR}/${_parv_PORT_LOG_FILE}; \ + ( \ + cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args \ + > $${log_file} 2> $${log_file} \ + ) & spawned=$$!; \ else \ (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args); \ spawned="yes"; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120628110736.DF9B11065675>