From ed26c01be15ebc9031ee5ef709d88d524f0fc16d Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Thu, 21 Feb 2013 08:15:39 -0600
Subject: quiet external module build log unless failure

ExternalProject usually involve a configure and a make
step that produce a bunch of output usually irrelevant
including a large number of warning and other mess.
now that everything is pretty much in tail_build
these output get interleaved with useful output from
the build of the product and actually drown them in a logorrhea
of messy noise.
This store the output of external modules in a log file
and only print them as a whole if the module failed do build.
on a non-verbose build.

Change-Id: I3abfcccd6d16821a9e061a71e031b427cc283647
Reviewed-on: https://gerrit.libreoffice.org/2304
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
---
 cppunit/ExternalProject_cppunit.mk | 58 +++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

(limited to 'cppunit')

diff --git a/cppunit/ExternalProject_cppunit.mk b/cppunit/ExternalProject_cppunit.mk
index b2f75e808fc0..45ed225d907f 100644
--- a/cppunit/ExternalProject_cppunit.mk
+++ b/cppunit/ExternalProject_cppunit.mk
@@ -19,40 +19,40 @@ $(eval $(call gb_ExternalProject_register_targets,cppunit,\
 ifeq ($(OS)$(COM),WNTMSC)
 ifeq ($(VCVER),90)
 $(call gb_ExternalProject_get_state_target,cppunit,build) :
-	cd $(EXTERNAL_WORKDIR)/src/cppunit \
-	&& $(COMPATH)/vcpackages/vcbuild.exe cppunit_dll.vcproj "Release|Win32" \
-	&& cd ../DllPlugInTester \
-	&& $(COMPATH)/vcpackages/vcbuild.exe DllPlugInTester.vcproj "Release|Win32" \
-	&& touch $@
+	$(call gb_ExternalProject_run,build,\
+		$(COMPATH)/vcpackages/vcbuild.exe cppunit_dll.vcproj "Release|Win32" \
+		&& cd ../DllPlugInTester \
+		&& $(COMPATH)/vcpackages/vcbuild.exe DllPlugInTester.vcproj "Release|Win32" \
+	,src/cppunit)
 else
 $(call gb_ExternalProject_get_state_target,cppunit,build) :
-	cd $(EXTERNAL_WORKDIR)/src/cppunit \
-	&& msbuild.exe cppunit_dll.vcxproj /p:Configuration=Release \
-	$(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110 /p:VisualStudioVersion=11.0) \
-	&& cd ../DllPlugInTester \
-	&& msbuild.exe DllPlugInTester.vcxproj /p:Configuration=Release \
-	$(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110 /p:VisualStudioVersion=11.0) \
-	&& touch $@
+	$(call gb_ExternalProject_run,build,\
+		msbuild.exe cppunit_dll.vcxproj /p:Configuration=Release \
+		$(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110 /p:VisualStudioVersion=11.0) \
+		&& cd ../DllPlugInTester \
+		&& msbuild.exe DllPlugInTester.vcxproj /p:Configuration=Release \
+		$(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110 /p:VisualStudioVersion=11.0) \
+	,src/cppunit)
 endif
 else
 $(call gb_ExternalProject_get_state_target,cppunit,build) :
-	cd $(EXTERNAL_WORKDIR) \
-	&& ./configure \
-		--disable-dependency-tracking \
-		$(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
-		--disable-doxygen \
-		--disable-html-docs \
-		--disable-latex-docs \
-		$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
-		$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________NONE) \
-		$(if $(filter WNT,$(OS)),LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \
-		$(if $(filter SOLARIS,$(OS)),LIBS="-lm") \
-		$(if $(filter ANDROID,$(OS)),LIBS="-lgnustl_shared -lm") \
-		CXXFLAGS="$(if $(filter GCC,$(COM)),$(if $(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY ANDROID,$(OS)),$(if $(filter TRUE,$(ENABLE_DBGUTIL)),-D_GLIBCXX_DEBUG),$(if $(filter WNT,$(OS)),-mthreads))) \
-		$(if $(debug),-g)" \
-	&& cd src \
-	&& $(MAKE) \
-	&& touch $@
+	$(call gb_ExternalProject_run,build,\
+		./configure \
+			--disable-dependency-tracking \
+			$(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
+			--disable-doxygen \
+			--disable-html-docs \
+			--disable-latex-docs \
+			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________NONE) \
+			$(if $(filter WNT,$(OS)),LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \
+			$(if $(filter SOLARIS,$(OS)),LIBS="-lm") \
+			$(if $(filter ANDROID,$(OS)),LIBS="-lgnustl_shared -lm") \
+			CXXFLAGS="$(if $(filter GCC,$(COM)),$(if $(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY ANDROID,$(OS)),$(if $(filter TRUE,$(ENABLE_DBGUTIL)),-D_GLIBCXX_DEBUG),$(if $(filter WNT,$(OS)),-mthreads))) \
+			$(if $(debug),-g)" \
+		&& cd src \
+		&& $(MAKE) \
+	)
 endif
 
 # vim: set noet sw=4 ts=4:
-- 
cgit