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>

11 files changed, 163 insertions, 167 deletions

diff --git a/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/jfreereport/ExternalProject_jfreereport_flow_engine.mk
index 7b2c215cf493..23fd99b1265f 100644
--- a/jfreereport/ExternalProject_jfreereport_flow_engine.mk
+++ b/jfreereport/ExternalProject_jfreereport_flow_engine.mk
@@ -20,21 +20,19 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_flow_engine,\
 ))
 
 $(call gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) :
-	cd "$(call gb_UnpackedTarball_get_dir,jfreereport_flow_engine)" && \
-	$(ICECREAM_RUN) "$(ANT)" \
-		-q \
-		-f build.xml \
-		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-		$(if $(filter YES,$(SYSTEM_APACHE_COMMONS))\
-			,-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) \
-		)\
-		-Dlib=$(OUTDIR)/bin \
-		$(if $(filter yes,$(JAVACISGCJ))\
-			,-Dbuild.compiler=gcj \
-			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
-		) \
-		$(if $(debug),-Dbuild.debug="on") jar && \
-	touch $@
+	$(call gb_ExternalProject_run,build,\
+		$(ICECREAM_RUN) "$(ANT)" \
+			-q \
+			-f build.xml \
+			-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
+			$(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) )\
+			-Dlib=$(OUTDIR)/bin \
+			$(if $(filter yes,$(JAVACISGCJ))\
+				,-Dbuild.compiler=gcj \
+				,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+				 -Dant.build.javac.target=$(JAVA_TARGET_VER) \
+			) \
+			$(if $(debug),-Dbuild.debug="on") jar \
+	)
 
 # vim: set noet sw=4 ts=4:
diff --git a/jfreereport/ExternalProject_jfreereport_flute.mk b/jfreereport/ExternalProject_jfreereport_flute.mk
index bfbf8fb3a751..7175f5dd8bb6 100644
--- a/jfreereport/ExternalProject_jfreereport_flute.mk
+++ b/jfreereport/ExternalProject_jfreereport_flute.mk
@@ -19,20 +19,20 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_flute,\
 ))
 
 $(call gb_ExternalProject_get_state_target,jfreereport_flute,build) :
-	cd "$(call gb_UnpackedTarball_get_dir,jfreereport_flute)" && \
-	$(ICECREAM_RUN) "$(ANT)" \
-		-q \
-		-f build.xml \
-		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-		$(if $(filter yes,$(JAVACISGCJ))\
-			,-Dbuild.compiler=gcj \
-			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
-		) \
-		-Dantcontrib.available="true" \
-		-Dbuild.id="10682" \
-		-Dproject.revision="$(FLUTE_VERSION)" \
-		$(if $(debug),-Dbuild.debug="on") jar && \
-	touch $@
+	$(call gb_ExternalProject_run,build,\
+		$(ICECREAM_RUN) "$(ANT)" \
+			-q \
+			-f build.xml \
+			-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
+			$(if $(filter yes,$(JAVACISGCJ))\
+				,-Dbuild.compiler=gcj \
+				,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+				 -Dant.build.javac.target=$(JAVA_TARGET_VER) \
+			) \
+			-Dantcontrib.available="true" \
+			-Dbuild.id="10682" \
+			-Dproject.revision="$(FLUTE_VERSION)" \
+			$(if $(debug),-Dbuild.debug="on") jar \
+	)
 
 # vim: set noet sw=4 ts=4:
diff --git a/jfreereport/ExternalProject_jfreereport_libbase.mk b/jfreereport/ExternalProject_jfreereport_libbase.mk
index 52aa5b39932b..6b5cf6f0dcb2 100644
--- a/jfreereport/ExternalProject_jfreereport_libbase.mk
+++ b/jfreereport/ExternalProject_jfreereport_libbase.mk
@@ -19,20 +19,20 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libbase,\
 ))
 
 $(call gb_ExternalProject_get_state_target,jfreereport_libbase,build) :
-	cd "$(call gb_UnpackedTarball_get_dir,jfreereport_libbase)" && \
-	$(ICECREAM_RUN) "$(ANT)" \
-		-q \
-		-f build.xml \
-		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-		$(if $(filter yes,$(JAVACISGCJ))\
-			,-Dbuild.compiler=gcj \
-			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
-		) \
-		-Dantcontrib.available="true" \
-		-Dbuild.id="10682" \
-		-Dproject.revision="$(LIBBASE_VERSION)" \
-		$(if $(debug),-Dbuild.debug="on") jar && \
-	touch $@
+	$(call gb_ExternalProject_run,build,\
+		$(ICECREAM_RUN) "$(ANT)" \
+			-q \
+			-f build.xml \
+			-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
+			$(if $(filter yes,$(JAVACISGCJ))\
+				,-Dbuild.compiler=gcj \
+				,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+				 -Dant.build.javac.target=$(JAVA_TARGET_VER) \
+			) \
+			-Dantcontrib.available="true" \
+			-Dbuild.id="10682" \
+			-Dproject.revision="$(LIBBASE_VERSION)" \
+			$(if $(debug),-Dbuild.debug="on") jar \
+	)
 
 # vim: set noet sw=4 ts=4:
diff --git a/jfreereport/ExternalProject_jfreereport_libfonts.mk b/jfreereport/ExternalProject_jfreereport_libfonts.mk
index a612c0a5b189..72e6fb171ea7 100644
--- a/jfreereport/ExternalProject_jfreereport_libfonts.mk
+++ b/jfreereport/ExternalProject_jfreereport_libfonts.mk
@@ -19,20 +19,20 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libfonts,\
 ))
 
 $(call gb_ExternalProject_get_state_target,jfreereport_libfonts,build) :
-	cd "$(call gb_UnpackedTarball_get_dir,jfreereport_libfonts)" && \
-	$(ICECREAM_RUN) "$(ANT)" \
-		-q \
-		-f build.xml \
-		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-		$(if $(filter yes,$(JAVACISGCJ))\
-			,-Dbuild.compiler=gcj \
-			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
-		) \
-		-Dantcontrib.available="true" \
-		-Dbuild.id="10682" \
-		-Dproject.revision="$(LIBFONTS_VERSION)" \
-		$(if $(debug),-Dbuild.debug="on") jar && \
-	touch $@
+	$(call gb_ExternalProject_run,build,\
+		$(ICECREAM_RUN) "$(ANT)" \
+			-q \
+			-f build.xml \
+			-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
+			$(if $(filter yes,$(JAVACISGCJ))\
+				,-Dbuild.compiler=gcj \
+				,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+				 -Dant.build.javac.target=$(JAVA_TARGET_VER) \
+			) \
+			-Dantcontrib.available="true" \
+			-Dbuild.id="10682" \
+			-Dproject.revision="$(LIBFONTS_VERSION)" \
+			$(if $(debug),-Dbuild.debug="on") jar \
+	)
 
 # vim: set noet sw=4 ts=4:
diff --git a/jfreereport/ExternalProject_jfreereport_libformula.mk b/jfreereport/ExternalProject_jfreereport_libformula.mk
index 145ad494c4ce..b7f6d95b7c0d 100644
--- a/jfreereport/ExternalProject_jfreereport_libformula.mk
+++ b/jfreereport/ExternalProject_jfreereport_libformula.mk
@@ -19,20 +19,20 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libformula,\
 ))
 
 $(call gb_ExternalProject_get_state_target,jfreereport_libformula,build) :
-	cd "$(call gb_UnpackedTarball_get_dir,jfreereport_libformula)" && \
-	$(ICECREAM_RUN) "$(ANT)" \
-		-q \
-		-f build.xml \
-		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-		$(if $(filter yes,$(JAVACISGCJ))\
-			,-Dbuild.compiler=gcj \
-			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
-		) \
-		-Dantcontrib.available="true" \
-		-Dbuild.id="10682" \
-		-Dproject.revision="$(LIBFORMULA_VERSION)" \
-		$(if $(debug),-Dbuild.debug="on") jar && \
-	touch $@
+	$(call gb_ExternalProject_run,build,\
+		$(ICECREAM_RUN) "$(ANT)" \
+			-q \
+			-f build.xml \
+			-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
+			$(if $(filter yes,$(JAVACISGCJ))\
+				,-Dbuild.compiler=gcj \
+				,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+				 -Dant.build.javac.target=$(JAVA_TARGET_VER) \
+			) \
+			-Dantcontrib.available="true" \
+			-Dbuild.id="10682" \
+			-Dproject.revision="$(LIBFORMULA_VERSION)" \
+			$(if $(debug),-Dbuild.debug="on") jar \
+	)
 
 # vim: set noet sw=4 ts=4:
diff --git a/jfreereport/ExternalProject_jfreereport_liblayout.mk b/jfreereport/ExternalProject_jfreereport_liblayout.mk
index 7cd9bc9af3cf..4c5d79d1d05c 100644
--- a/jfreereport/ExternalProject_jfreereport_liblayout.mk
+++ b/jfreereport/ExternalProject_jfreereport_liblayout.mk
@@ -34,23 +34,21 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_liblayout,\
 ))
 
 $(call gb_ExternalProject_get_state_target,jfreereport_liblayout,build) :
-	cd "$(call gb_UnpackedTarball_get_dir,jfreereport_liblayout)" && \
-	$(ICECREAM_RUN) "$(ANT)" \
-		-q \
-		-f build.xml \
-		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-		$(if $(filter YES,$(SYSTEM_APACHE_COMMONS))\
-			,-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) \
-		)\
-		$(if $(filter yes,$(JAVACISGCJ))\
-			,-Dbuild.compiler=gcj \
-			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
-		) \
-		-Dantcontrib.available="true" \
-		-Dbuild.id="10682" \
-		-Dlib=$(OUTDIR)/bin \
-		$(if $(debug),-Dbuild.debug="on") jar && \
-	touch $@
+	$(call gb_ExternalProject_run,build,\
+		$(ICECREAM_RUN) "$(ANT)" \
+			-q \
+			-f build.xml \
+			-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
+			$(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) )\
+			$(if $(filter yes,$(JAVACISGCJ))\
+				,-Dbuild.compiler=gcj \
+				,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+				 -Dant.build.javac.target=$(JAVA_TARGET_VER) \
+			) \
+			-Dantcontrib.available="true" \
+			-Dbuild.id="10682" \
+			-Dlib=$(OUTDIR)/bin \
+			$(if $(debug),-Dbuild.debug="on") jar \
+	)
 
 # vim: set noet sw=4 ts=4:
diff --git a/jfreereport/ExternalProject_jfreereport_libloader.mk b/jfreereport/ExternalProject_jfreereport_libloader.mk
index 90a97a7c0cd8..dc3d8d8f1ca4 100644
--- a/jfreereport/ExternalProject_jfreereport_libloader.mk
+++ b/jfreereport/ExternalProject_jfreereport_libloader.mk
@@ -19,20 +19,20 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libloader,\
 ))
 
 $(call gb_ExternalProject_get_state_target,jfreereport_libloader,build) :
-	cd "$(call gb_UnpackedTarball_get_dir,jfreereport_libloader)" && \
-	$(ICECREAM_RUN) "$(ANT)" \
-		-q \
-		-f build.xml \
-		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-		$(if $(filter yes,$(JAVACISGCJ))\
-			,-Dbuild.compiler=gcj \
-			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
-		) \
-		-Dantcontrib.available="true" \
-		-Dbuild.id="10682" \
-		-Dproject.revision="$(LIBLOADER_VERSION)" \
-		$(if $(debug),-Dbuild.debug="on") jar && \
-	touch $@
+	$(call gb_ExternalProject_run,build,\
+		$(ICECREAM_RUN) "$(ANT)" \
+			-q \
+			-f build.xml \
+			-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
+			$(if $(filter yes,$(JAVACISGCJ))\
+				,-Dbuild.compiler=gcj \
+				,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+				 -Dant.build.javac.target=$(JAVA_TARGET_VER) \
+			) \
+			-Dantcontrib.available="true" \
+			-Dbuild.id="10682" \
+			-Dproject.revision="$(LIBLOADER_VERSION)" \
+			$(if $(debug),-Dbuild.debug="on") jar \
+	)
 
 # vim: set noet sw=4 ts=4:
diff --git a/jfreereport/ExternalProject_jfreereport_librepository.mk b/jfreereport/ExternalProject_jfreereport_librepository.mk
index 38c4e56ea26c..215bd1ce90f8 100644
--- a/jfreereport/ExternalProject_jfreereport_librepository.mk
+++ b/jfreereport/ExternalProject_jfreereport_librepository.mk
@@ -19,20 +19,20 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_librepository,\
 ))
 
 $(call gb_ExternalProject_get_state_target,jfreereport_librepository,build) :
-	cd "$(call gb_UnpackedTarball_get_dir,jfreereport_librepository)" && \
-	$(ICECREAM_RUN) "$(ANT)" \
-		-q \
-		-f build.xml \
-		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-		$(if $(filter yes,$(JAVACISGCJ))\
-			,-Dbuild.compiler=gcj \
-			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
-		) \
-		-Dantcontrib.available="true" \
-		-Dbuild.id="10682" \
-		-Dproject.revision="$(LIBREPOSITORY_VERSION)" \
-		$(if $(debug),-Dbuild.debug="on") jar && \
-	touch $@
+	$(call gb_ExternalProject_run,build,\
+		$(ICECREAM_RUN) "$(ANT)" \
+			-q \
+			-f build.xml \
+			-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
+			$(if $(filter yes,$(JAVACISGCJ))\
+				,-Dbuild.compiler=gcj \
+				,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+				 -Dant.build.javac.target=$(JAVA_TARGET_VER) \
+			) \
+			-Dantcontrib.available="true" \
+			-Dbuild.id="10682" \
+			-Dproject.revision="$(LIBREPOSITORY_VERSION)" \
+			$(if $(debug),-Dbuild.debug="on") jar \
+	)
 
 # vim: set noet sw=4 ts=4:
diff --git a/jfreereport/ExternalProject_jfreereport_libserializer.mk b/jfreereport/ExternalProject_jfreereport_libserializer.mk
index 25558000a19b..93cdfd5311fe 100644
--- a/jfreereport/ExternalProject_jfreereport_libserializer.mk
+++ b/jfreereport/ExternalProject_jfreereport_libserializer.mk
@@ -19,20 +19,20 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libserializer,\
 ))
 
 $(call gb_ExternalProject_get_state_target,jfreereport_libserializer,build) :
-	cd "$(call gb_UnpackedTarball_get_dir,jfreereport_libserializer)" && \
-	$(ICECREAM_RUN) "$(ANT)" \
-		-q \
-		-f build.xml \
-		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)." \
-		$(if $(filter yes,$(JAVACISGCJ))\
-			,-Dbuild.compiler=gcj \
-			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
-		) \
-		-Dantcontrib.available="true" \
-		-Dbuild.id="10682" \
-		-Dproject.revision="$(LIBSERIALIZER_VERSION)" \
-		$(if $(debug),-Dbuild.debug="on") jar && \
-	touch $@
+	$(call gb_ExternalProject_run,build,\
+		$(ICECREAM_RUN) "$(ANT)" \
+			-q \
+			-f build.xml \
+			-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)." \
+			$(if $(filter yes,$(JAVACISGCJ))\
+				,-Dbuild.compiler=gcj \
+				,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+				 -Dant.build.javac.target=$(JAVA_TARGET_VER) \
+			) \
+			-Dantcontrib.available="true" \
+			-Dbuild.id="10682" \
+			-Dproject.revision="$(LIBSERIALIZER_VERSION)" \
+			$(if $(debug),-Dbuild.debug="on") jar \
+	)
 
 # vim: set noet sw=4 ts=4:
diff --git a/jfreereport/ExternalProject_jfreereport_libxml.mk b/jfreereport/ExternalProject_jfreereport_libxml.mk
index a43568ca4eb7..93967f58cf41 100644
--- a/jfreereport/ExternalProject_jfreereport_libxml.mk
+++ b/jfreereport/ExternalProject_jfreereport_libxml.mk
@@ -19,20 +19,20 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libxml,\
 ))
 
 $(call gb_ExternalProject_get_state_target,jfreereport_libxml,build) :
-	cd "$(call gb_UnpackedTarball_get_dir,jfreereport_libxml)" && \
-	$(ICECREAM_RUN) "$(ANT)" \
-		-q \
-		-f build.xml \
-		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-		$(if $(filter yes,$(JAVACISGCJ))\
-			,-Dbuild.compiler=gcj \
-			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
-		) \
-		-Dantcontrib.available="true" \
-		-Dbuild.id="10682" \
-		-Dproject.revision="$(LIBXML_VERSION)" \
-		$(if $(debug),-Dbuild.debug="on") jar && \
-	touch $@
+	$(call gb_ExternalProject_run,build,\
+		$(ICECREAM_RUN) "$(ANT)" \
+			-q \
+			-f build.xml \
+			-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
+			$(if $(filter yes,$(JAVACISGCJ))\
+				,-Dbuild.compiler=gcj \
+				,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+				 -Dant.build.javac.target=$(JAVA_TARGET_VER) \
+			) \
+			-Dantcontrib.available="true" \
+			-Dbuild.id="10682" \
+			-Dproject.revision="$(LIBXML_VERSION)" \
+			$(if $(debug),-Dbuild.debug="on") jar \
+	)
 
 # vim: set noet sw=4 ts=4:
diff --git a/jfreereport/ExternalProject_jfreereport_sac.mk b/jfreereport/ExternalProject_jfreereport_sac.mk
index 6b3a476a2aa8..750026887542 100644
--- a/jfreereport/ExternalProject_jfreereport_sac.mk
+++ b/jfreereport/ExternalProject_jfreereport_sac.mk
@@ -16,18 +16,18 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_sac,\
 ))
 
 $(call gb_ExternalProject_get_state_target,jfreereport_sac,build) :
-	cd "$(call gb_UnpackedTarball_get_dir,jfreereport_sac)" && \
-	$(ICECREAM_RUN) "$(ANT)" \
-		-q \
-		-f build.xml \
-		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-		$(if $(filter yes,$(JAVACISGCJ))\
-			,-Dbuild.compiler=gcj \
-			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
-		) \
-		-Dantcontrib.available="true" \
-		$(if $(debug),-Dbuild.debug="on") all && \
-	touch $@
+	$(call gb_ExternalProject_run,build,\
+		$(ICECREAM_RUN) "$(ANT)" \
+			-q \
+			-f build.xml \
+			-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
+			$(if $(filter yes,$(JAVACISGCJ))\
+				,-Dbuild.compiler=gcj \
+				,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+				 -Dant.build.javac.target=$(JAVA_TARGET_VER) \
+			) \
+			-Dantcontrib.available="true" \
+			$(if $(debug),-Dbuild.debug="on") all \
+	)
 
 # vim: set noet sw=4 ts=4: