more icerun annotation to stop parallel java builds from exploding

Change-Id: Ie05eeb89e79663674e223339918239facf49603a

apache-commons/ExternalProject_apache_commons_codec.mk

@@ -21,7 +21,7 @@ $(eval $(call gb_ExternalProject_register_targets,apache_commons_codec,\
 $(call gb_ExternalProject_get_state_target,apache_commons_codec,build) :
 	cd "$(call gb_UnpackedTarball_get_dir,apache_commons_codec)" && \
 	ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \
-	"$(ANT)" \
+	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
 		-Dbuild.label="build-$(RSCREVISION)" \

apache-commons/ExternalProject_apache_commons_httpclient.mk

@@ -24,7 +24,7 @@ $(eval $(call gb_ExternalProject_register_targets,apache_commons_httpclient,\
 $(call gb_ExternalProject_get_state_target,apache_commons_httpclient,build) :
 	cd "$(call gb_UnpackedTarball_get_dir,apache_commons_httpclient)" && \
 	ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \
-	"$(ANT)" \
+	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
 		-Dbuild.label="build-$(RSCREVISION)" \

apache-commons/ExternalProject_apache_commons_lang.mk

@@ -21,7 +21,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)" && \
 	ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \
-	"$(ANT)" \
+	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
 		-Dbuild.label="build-$(RSCREVISION)" \

apache-commons/ExternalProject_apache_commons_logging.mk

@@ -28,7 +28,7 @@ $(eval $(call gb_ExternalProject_register_targets,apache_commons_logging,\
 $(call gb_ExternalProject_get_state_target,apache_commons_logging,build) :
 	cd "$(call gb_UnpackedTarball_get_dir,apache_commons_logging)" && \
 	ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \
-	"$(ANT)" \
+	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
 		-Dbuild.label="build-$(RSCREVISION)" \

beanshell/ExternalProject_beanshell.mk

@@ -17,7 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,beanshell,\
 
 $(call gb_ExternalProject_get_state_target,beanshell,build) :
 	cd "$(call gb_UnpackedTarball_get_dir,beanshell)" && \
-	"$(ANT)" \
+	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
 		-Dbuild.label="build-libreoffice" \

hsqldb/ExternalProject_hsqldb.mk

@@ -17,7 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,hsqldb,\
 
 $(call gb_ExternalProject_get_state_target,hsqldb,build) :
 	cd $(EXTERNAL_WORKDIR) && \
-	"$(ANT)" \
+	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build/build.xml \
 		-Dbuild.label="build-libreoffice" \

jfreereport/ExternalProject_jfreereport_flow_engine.mk

@@ -24,7 +24,7 @@ $(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)" && \
-	"$(ANT)" \
+	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
 		-Dbuild.label="build-$(RSCREVISION)" \

jfreereport/ExternalProject_jfreereport_flute.mk

@@ -22,7 +22,7 @@ $(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)" && \
-	"$(ANT)" \
+	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
 		-Dbuild.label="build-$(RSCREVISION)" \

jfreereport/ExternalProject_jfreereport_libbase.mk

@@ -22,7 +22,7 @@ $(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)" && \
-	"$(ANT)" \
+	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
 		-Dbuild.label="build-$(RSCREVISION)" \

jfreereport/ExternalProject_jfreereport_libfonts.mk

@@ -22,7 +22,7 @@ $(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)" && \
-	"$(ANT)" \
+	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
 		-Dbuild.label="build-$(RSCREVISION)" \

jfreereport/ExternalProject_jfreereport_libformula.mk

@@ -22,7 +22,7 @@ $(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)" && \
-	"$(ANT)" \
+	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
 		-Dbuild.label="build-$(RSCREVISION)" \

jfreereport/ExternalProject_jfreereport_liblayout.mk

@@ -38,7 +38,7 @@ $(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)" && \
-	"$(ANT)" \
+	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
 		-Dbuild.label="build-$(RSCREVISION)" \

jfreereport/ExternalProject_jfreereport_libloader.mk

@@ -22,7 +22,7 @@ $(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)" && \
-	"$(ANT)" \
+	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
 		-Dbuild.label="build-$(RSCREVISION)" \

jfreereport/ExternalProject_jfreereport_librepository.mk

@@ -22,7 +22,7 @@ $(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)" && \
-	"$(ANT)" \
+	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
 		-Dbuild.label="build-$(RSCREVISION)" \

jfreereport/ExternalProject_jfreereport_libserializer.mk

@@ -22,7 +22,7 @@ $(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)" && \
-	"$(ANT)" \
+	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
 		-Dbuild.label="build-$(RSCREVISION)" \

jfreereport/ExternalProject_jfreereport_libxml.mk

@@ -22,7 +22,7 @@ $(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)" && \
-	"$(ANT)" \
+	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
 		-Dbuild.label="build-$(RSCREVISION)" \

jfreereport/ExternalProject_jfreereport_sac.mk

@@ -20,7 +20,7 @@ $(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)" && \
-	"$(ANT)" \
+	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
 		-Dbuild.label="build-$(RSCREVISION)" \

languagetool/ExternalProject_languagetool.mk

@@ -17,7 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,languagetool,\
 
 $(call gb_ExternalProject_get_state_target,languagetool,build) :
 	cd "$(call gb_UnpackedTarball_get_dir,languagetool)" && \
-	"$(ANT)" \
+	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
 		-Dbuild.label="build-libreoffice" \

rhino/ExternalProject_rhino.mk

@@ -20,7 +20,7 @@ $(eval $(call gb_ExternalProject_register_targets,rhino,\
 
 $(call gb_ExternalProject_get_state_target,rhino,build) :
 	cd "$(call gb_UnpackedTarball_get_dir,rhino)" && \
-	"$(ANT)" \
+	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
 		-Dbuild.label="build-$(RSCREVISION)" \

saxon/ExternalProject_saxon.mk

@@ -18,7 +18,7 @@ $(eval $(call gb_ExternalProject_register_targets,saxon,\
 $(call gb_ExternalProject_get_state_target,saxon,build) :
 	cd "$(call gb_UnpackedTarball_get_dir,saxon)" && \
 	ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \
-	"$(ANT)" \
+	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
 		-Dbuild.label="build-libreoffice" \

solenv/gbuild/gbuild.mk

@@ -188,18 +188,18 @@ include $(SRCDIR)/RepositoryFixes.mk
 # RepositoryExternal.mk ?
 ifeq ($(SYSTEM_LIBXSLT_FOR_BUILD),YES)
 gb_XSLTPROCTARGET :=
-gb_XSLTPROC := xsltproc
+gb_XSLTPROC := $(ICECREAM_RUN) xsltproc
 else
 gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc)
-gb_XSLTPROC := $(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET)
+gb_XSLTPROC := $(gb_Helper_set_ld_path) $(ICECREAM_RUN) $(gb_XSLTPROCTARGET)
 endif
 
 ifeq ($(SYSTEM_LIBXML_FOR_BUILD),YES)
 gb_XMLLINTTARGET :=
-gb_XMLLINT := xsltproc
+gb_XMLLINT := $(ICECREAM_RUN) xsltproc
 else
 gb_XMLLINTTARGET := $(call gb_Executable_get_target_for_build,xsltproc)
-gb_XMLLINT := $(gb_Helper_set_ld_path) $(gb_XMLLINTTARGET)
+gb_XMLLINT := $(gb_Helper_set_ld_path) $(ICECREAM_RUN) $(gb_XMLLINTTARGET)
 endif
 
 ifeq ($(SYSTEM_PYTHON),YES)

tomcat/ExternalProject_tomcat.mk

@@ -20,7 +20,7 @@ $(eval $(call gb_ExternalProject_register_targets,tomcat,\
 
 $(call gb_ExternalProject_get_state_target,tomcat,build) :
 	cd "$(call gb_UnpackedTarball_get_dir,tomcat)/jakarta-servletapi-5" && \
-	"$(ANT)" \
+	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
 		-Dbuild.label="build-$(RSCREVISION)" \