Kaydet (Commit) c4f0977c authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Pass "verbose" flag into ant

Change-Id: I76d7c8a41d64baae3591dd188a2d2e46f17622bb
Reviewed-on: https://gerrit.libreoffice.org/41735Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 64a4ad3a
...@@ -17,7 +17,7 @@ $(call gb_ExternalProject_get_state_target,apache_commons_logging,build) : ...@@ -17,7 +17,7 @@ $(call gb_ExternalProject_get_state_target,apache_commons_logging,build) :
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \ ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \
$(ICECREAM_RUN) "$(ANT)" \ $(ICECREAM_RUN) "$(ANT)" \
-q \ $(if $(verbose),-v,-q) \
-f build.xml \ -f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ -Dant.build.javac.source=$(JAVA_SOURCE_VER) \
......
...@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,beanshell,\ ...@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,beanshell,\
$(call gb_ExternalProject_get_state_target,beanshell,build) : $(call gb_ExternalProject_get_state_target,beanshell,build) :
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
$(ICECREAM_RUN) "$(ANT)" \ $(ICECREAM_RUN) "$(ANT)" \
-q \ $(if $(verbose),-v,-q) \
-f build.xml \ -f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ -Dant.build.javac.source=$(JAVA_SOURCE_VER) \
......
...@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,hsqldb,\ ...@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,hsqldb,\
$(call gb_ExternalProject_get_state_target,hsqldb,build) : $(call gb_ExternalProject_get_state_target,hsqldb,build) :
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
$(ICECREAM_RUN) "$(ANT)" \ $(ICECREAM_RUN) "$(ANT)" \
-q \ $(if $(verbose),-v,-q) \
-f build/build.xml \ -f build/build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ -Dant.build.javac.source=$(JAVA_SOURCE_VER) \
......
...@@ -20,7 +20,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_flow_engine,\ ...@@ -20,7 +20,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_flow_engine,\
$(call gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) : $(call gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) :
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
$(ICECREAM_RUN) "$(ANT)" \ $(ICECREAM_RUN) "$(ANT)" \
-q \ $(if $(verbose),-v,-q) \
-f build.xml \ -f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
$(if $(SYSTEM_APACHE_COMMONS),\ $(if $(SYSTEM_APACHE_COMMONS),\
......
...@@ -19,7 +19,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_flute,\ ...@@ -19,7 +19,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_flute,\
$(call gb_ExternalProject_get_state_target,jfreereport_flute,build) : $(call gb_ExternalProject_get_state_target,jfreereport_flute,build) :
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
$(ICECREAM_RUN) "$(ANT)" \ $(ICECREAM_RUN) "$(ANT)" \
-q \ $(if $(verbose),-v,-q) \
-f build.xml \ -f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ -Dant.build.javac.source=$(JAVA_SOURCE_VER) \
......
...@@ -19,7 +19,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libbase,\ ...@@ -19,7 +19,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libbase,\
$(call gb_ExternalProject_get_state_target,jfreereport_libbase,build) : $(call gb_ExternalProject_get_state_target,jfreereport_libbase,build) :
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
$(ICECREAM_RUN) "$(ANT)" \ $(ICECREAM_RUN) "$(ANT)" \
-q \ $(if $(verbose),-v,-q) \
-f build.xml \ -f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ -Dant.build.javac.source=$(JAVA_SOURCE_VER) \
......
...@@ -19,7 +19,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libfonts,\ ...@@ -19,7 +19,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libfonts,\
$(call gb_ExternalProject_get_state_target,jfreereport_libfonts,build) : $(call gb_ExternalProject_get_state_target,jfreereport_libfonts,build) :
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
$(ICECREAM_RUN) "$(ANT)" \ $(ICECREAM_RUN) "$(ANT)" \
-q \ $(if $(verbose),-v,-q) \
-f build.xml \ -f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ -Dant.build.javac.source=$(JAVA_SOURCE_VER) \
......
...@@ -19,7 +19,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libformula,\ ...@@ -19,7 +19,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libformula,\
$(call gb_ExternalProject_get_state_target,jfreereport_libformula,build) : $(call gb_ExternalProject_get_state_target,jfreereport_libformula,build) :
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
$(ICECREAM_RUN) "$(ANT)" \ $(ICECREAM_RUN) "$(ANT)" \
-q \ $(if $(verbose),-v,-q) \
-f build.xml \ -f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ -Dant.build.javac.source=$(JAVA_SOURCE_VER) \
......
...@@ -32,7 +32,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_liblayout,\ ...@@ -32,7 +32,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_liblayout,\
$(call gb_ExternalProject_get_state_target,jfreereport_liblayout,build) : $(call gb_ExternalProject_get_state_target,jfreereport_liblayout,build) :
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
$(ICECREAM_RUN) "$(ANT)" \ $(ICECREAM_RUN) "$(ANT)" \
-q \ $(if $(verbose),-v,-q) \
-f build.xml \ -f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
$(if $(SYSTEM_APACHE_COMMONS),\ $(if $(SYSTEM_APACHE_COMMONS),\
......
...@@ -19,7 +19,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libloader,\ ...@@ -19,7 +19,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libloader,\
$(call gb_ExternalProject_get_state_target,jfreereport_libloader,build) : $(call gb_ExternalProject_get_state_target,jfreereport_libloader,build) :
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
$(ICECREAM_RUN) "$(ANT)" \ $(ICECREAM_RUN) "$(ANT)" \
-q \ $(if $(verbose),-v,-q) \
-f build.xml \ -f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ -Dant.build.javac.source=$(JAVA_SOURCE_VER) \
......
...@@ -19,7 +19,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_librepository,\ ...@@ -19,7 +19,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_librepository,\
$(call gb_ExternalProject_get_state_target,jfreereport_librepository,build) : $(call gb_ExternalProject_get_state_target,jfreereport_librepository,build) :
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
$(ICECREAM_RUN) "$(ANT)" \ $(ICECREAM_RUN) "$(ANT)" \
-q \ $(if $(verbose),-v,-q) \
-f build.xml \ -f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ -Dant.build.javac.source=$(JAVA_SOURCE_VER) \
......
...@@ -19,7 +19,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libserializer,\ ...@@ -19,7 +19,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libserializer,\
$(call gb_ExternalProject_get_state_target,jfreereport_libserializer,build) : $(call gb_ExternalProject_get_state_target,jfreereport_libserializer,build) :
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
$(ICECREAM_RUN) "$(ANT)" \ $(ICECREAM_RUN) "$(ANT)" \
-q \ $(if $(verbose),-v,-q) \
-f build.xml \ -f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)." \ -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)." \
-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ -Dant.build.javac.source=$(JAVA_SOURCE_VER) \
......
...@@ -19,7 +19,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libxml,\ ...@@ -19,7 +19,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libxml,\
$(call gb_ExternalProject_get_state_target,jfreereport_libxml,build) : $(call gb_ExternalProject_get_state_target,jfreereport_libxml,build) :
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
$(ICECREAM_RUN) "$(ANT)" \ $(ICECREAM_RUN) "$(ANT)" \
-q \ $(if $(verbose),-v,-q) \
-f build.xml \ -f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ -Dant.build.javac.source=$(JAVA_SOURCE_VER) \
......
...@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_sac,\ ...@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_sac,\
$(call gb_ExternalProject_get_state_target,jfreereport_sac,build) : $(call gb_ExternalProject_get_state_target,jfreereport_sac,build) :
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
$(ICECREAM_RUN) "$(ANT)" \ $(ICECREAM_RUN) "$(ANT)" \
-q \ $(if $(verbose),-v,-q) \
-f build.xml \ -f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ -Dant.build.javac.source=$(JAVA_SOURCE_VER) \
......
...@@ -23,7 +23,7 @@ $(eval $(call gb_ExternalProject_use_jars,languagetool,\ ...@@ -23,7 +23,7 @@ $(eval $(call gb_ExternalProject_use_jars,languagetool,\
$(call gb_ExternalProject_get_state_target,languagetool,build) : $(call gb_ExternalProject_get_state_target,languagetool,build) :
cd "$(call gb_UnpackedTarball_get_dir,languagetool)" && \ cd "$(call gb_UnpackedTarball_get_dir,languagetool)" && \
$(ICECREAM_RUN) "$(ANT)" \ $(ICECREAM_RUN) "$(ANT)" \
-q \ $(if $(verbose),-v,-q) \
-f build.xml \ -f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ -Dant.build.javac.source=$(JAVA_SOURCE_VER) \
......
...@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,owncloud_android_lib,\ ...@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,owncloud_android_lib,\
$(call gb_ExternalProject_get_state_target,owncloud_android_lib,build) : $(call gb_ExternalProject_get_state_target,owncloud_android_lib,build) :
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
$(ICECREAM_RUN) "$(ANT)" \ $(ICECREAM_RUN) "$(ANT)" \
-q \ $(if $(verbose),-v,-q) \
-f build.xml \ -f build.xml \
-Dsdk.dir=$(ANDROID_SDK_HOME) -Dtarget=android-22 \ -Dsdk.dir=$(ANDROID_SDK_HOME) -Dtarget=android-22 \
release \ release \
......
...@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,rhino,\ ...@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,rhino,\
$(call gb_ExternalProject_get_state_target,rhino,build) : $(call gb_ExternalProject_get_state_target,rhino,build) :
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
$(ICECREAM_RUN) "$(ANT)" \ $(ICECREAM_RUN) "$(ANT)" \
-q \ $(if $(verbose),-v,-q) \
-f build.xml \ -f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-DTARFILE_LOCATION="$(if $(findstring -cygwin,$(BUILD_PLATFORM)),$(shell cygpath -m $(TARFILE_LOCATION)),$(TARFILE_LOCATION))" \ -DTARFILE_LOCATION="$(if $(findstring -cygwin,$(BUILD_PLATFORM)),$(shell cygpath -m $(TARFILE_LOCATION)),$(TARFILE_LOCATION))" \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment