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>
---
 icu/ExternalProject_icu.mk | 69 +++++++++++++++++++++++-----------------------
 1 file changed, 35 insertions(+), 34 deletions(-)

(limited to 'icu')

diff --git a/icu/ExternalProject_icu.mk b/icu/ExternalProject_icu.mk
index b76b333c6aa6..a376b4f51241 100644
--- a/icu/ExternalProject_icu.mk
+++ b/icu/ExternalProject_icu.mk
@@ -23,27 +23,27 @@ ifeq ($(OS),WNT)
 
 ifeq ($(COM),MSC)
 $(call gb_ExternalProject_get_state_target,icu,build) :
-	cd $(EXTERNAL_WORKDIR)/source \
-	&& export LIB="$(ILIB)" \
-	&& CFLAGS="$(SOLARINC)" CPPFLAGS="$(SOLARINC)" CXXFLAGS="$(SOLARINC)" ./runConfigureICU Cygwin/MSVC \
-	&& $(MAKE) \
-	&& touch $@
+	$(call gb_ExternalProject_run,build,\
+		export LIB="$(ILIB)" \
+		&& CFLAGS="$(SOLARINC)" CPPFLAGS="$(SOLARINC)" CXXFLAGS="$(SOLARINC)" ./runConfigureICU Cygwin/MSVC \
+		&& $(MAKE) \
+	,source)
 else
 $(call gb_ExternalProject_get_state_target,icu,build) :
-	cd $(EXTERNAL_WORKDIR)/source \
-	&& CPPFLAGS=$(icu_CPPFLAGS) CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" \
-	LIBS="$(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED_LIBSTDCPP))" \
-	LDFLAGS="-L$(COMPATH)/lib -Wl,--enable-runtime-pseudo-reloc-v2 \
-	$(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
-	./configure
-	$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
-		--with-cross-build=$(subst $(INPATH),$(INPATH_FOR_BUILD),$(call gb_UnpackedTarball_get_dir,icu))/source) \
-	--enable-layout --disable-static --enable-shared --disable-samples \
-	&& $(MAKE) \
-	&& for lib in icudata icuin icuuc icule icutu; do \
-	@touch $$lib; \
-	done \
-	&& touch $@
+	$(call gb_ExternalProject_run,build,\
+		CPPFLAGS=$(icu_CPPFLAGS) CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" \
+		LIBS="$(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED_LIBSTDCPP))" \
+		LDFLAGS="-L$(COMPATH)/lib -Wl,--enable-runtime-pseudo-reloc-v2 \
+				$(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
+		./configure
+			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
+			--with-cross-build=$(subst $(INPATH),$(INPATH_FOR_BUILD),$(call gb_UnpackedTarball_get_dir,icu))/source) \
+			--enable-layout --disable-static --enable-shared --disable-samples \
+		&& $(MAKE) \
+		&&  for lib in icudata icuin icuuc icule icutu; do \
+			@touch $$lib; \
+			done \
+	,source)
 endif
 
 else # $(OS)
@@ -64,21 +64,22 @@ icu_LDFLAGS:="$(if $(filter TRUE,$(HAVE_LD_HASH_STYLE)),-Wl$(COMMA)--hash-style=
 	    $(if $(filter ANDROID,$(OS)),-lgnustl_shared -lm)"
 
 $(call gb_ExternalProject_get_state_target,icu,build) :
-	cd $(EXTERNAL_WORKDIR)/source \
-	&& CPPFLAGS=$(icu_CPPFLAGS) CFLAGS=$(icu_CFLAGS) \
-	CXXFLAGS=$(icu_CXXFLAGS) LDFLAGS=$(icu_LDFLAGS) \
-	./configure \
-		--enable-layout --disable-samples \
-		$(if $(filter IOS ANDROID,$(OS)),--disable-dyload) \
-		$(if $(filter ANDROID,$(OS)),--disable-strict) \
-		$(if $(filter SOLARIS AIX,$(OS)),--disable-64bit-libs) \
-		$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
-		$(if $(filter TRUE,$(DISABLE_DYNLOADING)),--enable-static --disable-shared,\
-		--disable-static --enable-shared $(if $(filter ANDROID,$(OS)),--with-library-suffix=lo)) \
-		$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)\
-			--with-cross-build=$(subst $(INPATH),$(INPATH_FOR_BUILD),$(call gb_UnpackedTarball_get_dir,icu))/source)\
-	&& $(MAKE) \
-	&& touch $@
+	$(call gb_ExternalProject_run,build,\
+		CPPFLAGS=$(icu_CPPFLAGS) CFLAGS=$(icu_CFLAGS) \
+		CXXFLAGS=$(icu_CXXFLAGS) LDFLAGS=$(icu_LDFLAGS) \
+		./configure \
+			--enable-layout --disable-samples \
+			$(if $(filter IOS ANDROID,$(OS)),--disable-dyload) \
+			$(if $(filter ANDROID,$(OS)),--disable-strict) \
+			$(if $(filter SOLARIS AIX,$(OS)),--disable-64bit-libs) \
+			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
+			$(if $(filter TRUE,$(DISABLE_DYNLOADING)),\
+				--enable-static --disable-shared,\
+				--disable-static --enable-shared $(if $(filter ANDROID,$(OS)),--with-library-suffix=lo)) \
+			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)\
+				--with-cross-build=$(subst $(INPATH),$(INPATH_FOR_BUILD),$(call gb_UnpackedTarball_get_dir,icu))/source)\
+		&& $(MAKE) \
+	,source)
 
 endif
 
-- 
cgit