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 /liborcus | |
| 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 'liborcus')
| -rw-r--r-- | liborcus/ExternalProject_liborcus.mk | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk index 2bbf2e9d40c9..67d5055f0d8d 100644 --- a/liborcus/ExternalProject_liborcus.mk +++ b/liborcus/ExternalProject_liborcus.mk @@ -21,49 +21,49 @@ ifeq ($(OS)$(COM),WNTMSC) ifeq ($(VCVER),90) $(call gb_ExternalProject_get_state_target,liborcus,build) : - cd $(EXTERNAL_WORKDIR)/vsprojects/liborcus-static-nozip \ - && export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \ - && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ - && export BOOST_LIB_DIR=$(OUTDIR)/lib \ - && $(COMPATH)/vcpackages/vcbuild.exe liborcus-static-nozip.vcproj "Release|Win32" \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \ + && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ + && export BOOST_LIB_DIR=$(OUTDIR)/lib \ + && $(COMPATH)/vcpackages/vcbuild.exe liborcus-static-nozip.vcproj "Release|Win32" \ + ,vsprojects/liborcus-static-nozip) else ifeq ($(VCVER),100) $(call gb_ExternalProject_get_state_target,liborcus,build) : - cd $(EXTERNAL_WORKDIR)/vsprojects/liborcus-static-nozip \ - && export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \ - && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ - && export BOOST_LIB_DIR=$(OUTDIR)/lib \ - && MSBuild.exe liborcus-static-nozip.vcxproj /p:Configuration=Release /p:OutDir=Release/ /p:TargetName=orcus /p:WholeProgramOptimization=no \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \ + && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ + && export BOOST_LIB_DIR=$(OUTDIR)/lib \ + && MSBuild.exe liborcus-static-nozip.vcxproj /p:Configuration=Release /p:OutDir=Release/ /p:TargetName=orcus /p:WholeProgramOptimization=no \ + ,vsprojects/liborcus-static-nozip) else $(call gb_ExternalProject_get_state_target,liborcus,build) : - cd $(EXTERNAL_WORKDIR)/vsprojects/liborcus-static-nozip \ - && export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \ - && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ - && export BOOST_LIB_DIR=$(OUTDIR)/lib \ - && MSBuild.exe liborcus-static-nozip.vcxproj /p:PlatformToolset=v110 /p:VisualStudioVersion=11.0 /p:Configuration=Release /p:OutDir=Release/ /p:TargetName=orcus /p:WholeProgramOptimization=no \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \ + && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ + && export BOOST_LIB_DIR=$(OUTDIR)/lib \ + && MSBuild.exe liborcus-static-nozip.vcxproj /p:PlatformToolset=v110 /p:VisualStudioVersion=11.0 /p:Configuration=Release /p:OutDir=Release/ /p:TargetName=orcus /p:WholeProgramOptimization=no \ + ,vsprojects/liborcus-static-nozip) endif else # must be built with debug STL if --enable-dbgutil $(call gb_ExternalProject_get_state_target,liborcus,build) : - cd $(EXTERNAL_WORKDIR) \ - && $(if $(filter ANDROID,$(OS)),LIBS='-lgnustl_shared -lm') \ - ./configure \ - --with-pic \ - --enable-static \ - --disable-shared \ - --without-libzip \ - --disable-debug \ - --disable-spreadsheet-model \ - --disable-werror \ - $(if $(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY ANDROID,$(OS)),$(if $(gb_ENABLE_DBGUTIL),CPPFLAGS=-D_GLIBCXX_DEBUG)) \ - $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(call gb_UnpackedTarball_get_dir,boost),CXXFLAGS=$(BOOST_CPPFLAGS) LDFLAGS=$(BOOST_LDFLAGS)) \ - $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - && $(MAKE) \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + $(if $(filter ANDROID,$(OS)),LIBS='-lgnustl_shared -lm') \ + ./configure \ + --with-pic \ + --enable-static \ + --disable-shared \ + --without-libzip \ + --disable-debug \ + --disable-spreadsheet-model \ + --disable-werror \ + $(if $(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY ANDROID,$(OS)),$(if $(gb_ENABLE_DBGUTIL),CPPFLAGS=-D_GLIBCXX_DEBUG)) \ + $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(call gb_UnpackedTarball_get_dir,boost),CXXFLAGS=$(BOOST_CPPFLAGS) LDFLAGS=$(BOOST_LDFLAGS)) \ + $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + && $(MAKE) \ + ) endif |