diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-02-21 08:15:39 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-02-22 08:25:56 +0000 |
| commit | ed26c01be15ebc9031ee5ef709d88d524f0fc16d (patch) | |
| tree | 1629e51b40fe52a3cc85795dd34c5f08b9483458 /libmspub | |
| parent | c04c95958030bd4872fbbc0b3d4bc996fb041488 (diff) | |
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>
Diffstat (limited to 'libmspub')
| -rw-r--r-- | libmspub/ExternalProject_libmspub.mk | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/libmspub/ExternalProject_libmspub.mk b/libmspub/ExternalProject_libmspub.mk index 9fdcce16f886..73ca1c6ab461 100644 --- a/libmspub/ExternalProject_libmspub.mk +++ b/libmspub/ExternalProject_libmspub.mk @@ -26,56 +26,56 @@ ifeq ($(OS)$(COM),WNTMSC) ifeq ($(VCVER),90) $(call gb_ExternalProject_get_state_target,libmspub,build) : - cd $(EXTERNAL_WORKDIR)/build/win32 \ - && export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \ - && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ - && export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && $(COMPATH)/vcpackages/vcbuild.exe libmspub.vcproj "Release|Win32" \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \ + && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ + && export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && $(COMPATH)/vcpackages/vcbuild.exe libmspub.vcproj "Release|Win32" \ + ,build/win32) else ifeq ($(VCVER),100) $(call gb_ExternalProject_get_state_target,libmspub,build) : - cd $(EXTERNAL_WORKDIR)/build/win32 \ - && export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \ - && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ - && export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && msbuild.exe libmspub.vcxproj /p:Configuration=Release \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \ + && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ + && export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && msbuild.exe libmspub.vcxproj /p:Configuration=Release \ + ,build/win32) else $(call gb_ExternalProject_get_state_target,libmspub,build) : - cd $(EXTERNAL_WORKDIR)/build/win32 \ - && export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \ - && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ - && export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && msbuild.exe libmspub.vcxproj /p:PlatformToolset=v110 /p:VisualStudioVersion=11.0 /p:Configuration=Release \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \ + && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ + && export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && msbuild.exe libmspub.vcxproj /p:PlatformToolset=v110 /p:VisualStudioVersion=11.0 /p:Configuration=Release \ + ,build/win32) endif else $(call gb_ExternalProject_get_state_target,libmspub,build) : - cd $(EXTERNAL_WORKDIR) \ - && export PKG_CONFIG="" \ - && export ICU_LIBS=" " && export ICU_CFLAGS="-I$(OUTDIR)/inc/external" \ - && export LIBMSPUB_CFLAGS="$(WPG_CFLAGS) $(WPD_CFLAGS)" \ - && export LIBMSPUB_LIBS="$(WPG_LIBS) $(WPD_LIBS)" \ - && ./configure \ - --with-pic \ - --enable-static \ - --disable-shared \ - --without-docs \ - --disable-debug \ - --disable-werror \ - --disable-weffc \ - $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(call gb_UnpackedTarball_get_dir,boost),CXXFLAGS=$(BOOST_CPPFLAGS)) \ - $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - && (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + export PKG_CONFIG="" \ + && export ICU_LIBS=" " && export ICU_CFLAGS="-I$(OUTDIR)/inc/external" \ + && export LIBMSPUB_CFLAGS="$(WPG_CFLAGS) $(WPD_CFLAGS)" \ + && export LIBMSPUB_LIBS="$(WPG_LIBS) $(WPD_LIBS)" \ + && ./configure \ + --with-pic \ + --enable-static \ + --disable-shared \ + --without-docs \ + --disable-debug \ + --disable-werror \ + --disable-weffc \ + $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(call gb_UnpackedTarball_get_dir,boost),CXXFLAGS=$(BOOST_CPPFLAGS)) \ + $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + && (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \ + ) endif |