summaryrefslogtreecommitdiffstats
path: root/apache-commons/ExternalProject_apache_commons_lang.mk
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2013-02-21 08:15:39 -0600
committerNorbert Thiebaud <nthiebaud@gmail.com>2013-02-22 08:25:56 +0000
commited26c01be15ebc9031ee5ef709d88d524f0fc16d (patch)
tree1629e51b40fe52a3cc85795dd34c5f08b9483458 /apache-commons/ExternalProject_apache_commons_lang.mk
parentfix for fdo#61187 (diff)
downloadcore-ed26c01be15ebc9031ee5ef709d88d524f0fc16d.tar.gz
core-ed26c01be15ebc9031ee5ef709d88d524f0fc16d.zip
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 'apache-commons/ExternalProject_apache_commons_lang.mk')
-rw-r--r--apache-commons/ExternalProject_apache_commons_lang.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/apache-commons/ExternalProject_apache_commons_lang.mk b/apache-commons/ExternalProject_apache_commons_lang.mk
index b343dc71e47e..283375eb8d2a 100644
--- a/apache-commons/ExternalProject_apache_commons_lang.mk
+++ b/apache-commons/ExternalProject_apache_commons_lang.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,apache_commons_lang,\
))
$(call gb_ExternalProject_get_state_target,apache_commons_lang,build) :
- cd "$(call gb_UnpackedTarball_get_dir,apache_commons_lang)" && \
+ $(call gb_ExternalProject_run,build,\
ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \
$(ICECREAM_RUN) "$(ANT)" \
-q \
@@ -28,7 +28,7 @@ $(call gb_ExternalProject_get_state_target,apache_commons_lang,build) :
-Dant.build.javac.target=$(JAVA_TARGET_VER) \
) \
$(if $(debug),-Dbuild.debug="on") \
- jar && \
- touch $@
+ jar \
+ )
# vim: set noet sw=4 ts=4: