[Libreoffice-commits] core.git: external/apache-commons external/beanshell external/hsqldb external/jfreereport external/languagetool external/owncloud-android-lib external/rhino
Stephan Bergmann
sbergman at redhat.com
Wed Aug 30 15:07:50 UTC 2017
external/apache-commons/ExternalProject_apache_commons_logging.mk | 2 +-
external/beanshell/ExternalProject_beanshell.mk | 2 +-
external/hsqldb/ExternalProject_hsqldb.mk | 2 +-
external/jfreereport/ExternalProject_jfreereport_flow_engine.mk | 2 +-
external/jfreereport/ExternalProject_jfreereport_flute.mk | 2 +-
external/jfreereport/ExternalProject_jfreereport_libbase.mk | 2 +-
external/jfreereport/ExternalProject_jfreereport_libfonts.mk | 2 +-
external/jfreereport/ExternalProject_jfreereport_libformula.mk | 2 +-
external/jfreereport/ExternalProject_jfreereport_liblayout.mk | 2 +-
external/jfreereport/ExternalProject_jfreereport_libloader.mk | 2 +-
external/jfreereport/ExternalProject_jfreereport_librepository.mk | 2 +-
external/jfreereport/ExternalProject_jfreereport_libserializer.mk | 2 +-
external/jfreereport/ExternalProject_jfreereport_libxml.mk | 2 +-
external/jfreereport/ExternalProject_jfreereport_sac.mk | 2 +-
external/languagetool/ExternalProject_languagetool.mk | 2 +-
external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk | 2 +-
external/rhino/ExternalProject_rhino.mk | 2 +-
17 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit c4f0977ccc97c8c7aca51666f6fcc3089a3f3c7c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Aug 30 16:00:37 2017 +0200
Pass "verbose" flag into ant
Change-Id: I76d7c8a41d64baae3591dd188a2d2e46f17622bb
Reviewed-on: https://gerrit.libreoffice.org/41735
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/external/apache-commons/ExternalProject_apache_commons_logging.mk b/external/apache-commons/ExternalProject_apache_commons_logging.mk
index d260e19dc34e..47981ee9ecd6 100644
--- a/external/apache-commons/ExternalProject_apache_commons_logging.mk
+++ b/external/apache-commons/ExternalProject_apache_commons_logging.mk
@@ -17,7 +17,7 @@ $(call gb_ExternalProject_get_state_target,apache_commons_logging,build) :
$(call gb_ExternalProject_run,build,\
ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \
$(ICECREAM_RUN) "$(ANT)" \
- -q \
+ $(if $(verbose),-v,-q) \
-f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
diff --git a/external/beanshell/ExternalProject_beanshell.mk b/external/beanshell/ExternalProject_beanshell.mk
index 62ac1f9df3b2..6f43c9477e40 100644
--- a/external/beanshell/ExternalProject_beanshell.mk
+++ b/external/beanshell/ExternalProject_beanshell.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,beanshell,\
$(call gb_ExternalProject_get_state_target,beanshell,build) :
$(call gb_ExternalProject_run,build,\
$(ICECREAM_RUN) "$(ANT)" \
- -q \
+ $(if $(verbose),-v,-q) \
-f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
diff --git a/external/hsqldb/ExternalProject_hsqldb.mk b/external/hsqldb/ExternalProject_hsqldb.mk
index 2f7a08e7ea73..4ecc00af978f 100644
--- a/external/hsqldb/ExternalProject_hsqldb.mk
+++ b/external/hsqldb/ExternalProject_hsqldb.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,hsqldb,\
$(call gb_ExternalProject_get_state_target,hsqldb,build) :
$(call gb_ExternalProject_run,build,\
$(ICECREAM_RUN) "$(ANT)" \
- -q \
+ $(if $(verbose),-v,-q) \
-f build/build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
diff --git a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
index e220cc20a56b..38247c21f50f 100644
--- a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
@@ -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_run,build,\
$(ICECREAM_RUN) "$(ANT)" \
- -q \
+ $(if $(verbose),-v,-q) \
-f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
$(if $(SYSTEM_APACHE_COMMONS),\
diff --git a/external/jfreereport/ExternalProject_jfreereport_flute.mk b/external/jfreereport/ExternalProject_jfreereport_flute.mk
index 0620101e7242..e3b4167a3cfa 100644
--- a/external/jfreereport/ExternalProject_jfreereport_flute.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_flute.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_flute,\
$(call gb_ExternalProject_get_state_target,jfreereport_flute,build) :
$(call gb_ExternalProject_run,build,\
$(ICECREAM_RUN) "$(ANT)" \
- -q \
+ $(if $(verbose),-v,-q) \
-f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
diff --git a/external/jfreereport/ExternalProject_jfreereport_libbase.mk b/external/jfreereport/ExternalProject_jfreereport_libbase.mk
index 2ae4b9c6fcca..8ad52770342d 100644
--- a/external/jfreereport/ExternalProject_jfreereport_libbase.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_libbase.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libbase,\
$(call gb_ExternalProject_get_state_target,jfreereport_libbase,build) :
$(call gb_ExternalProject_run,build,\
$(ICECREAM_RUN) "$(ANT)" \
- -q \
+ $(if $(verbose),-v,-q) \
-f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
diff --git a/external/jfreereport/ExternalProject_jfreereport_libfonts.mk b/external/jfreereport/ExternalProject_jfreereport_libfonts.mk
index 338fbbd5c8fc..bf19cd112d21 100644
--- a/external/jfreereport/ExternalProject_jfreereport_libfonts.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_libfonts.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libfonts,\
$(call gb_ExternalProject_get_state_target,jfreereport_libfonts,build) :
$(call gb_ExternalProject_run,build,\
$(ICECREAM_RUN) "$(ANT)" \
- -q \
+ $(if $(verbose),-v,-q) \
-f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
diff --git a/external/jfreereport/ExternalProject_jfreereport_libformula.mk b/external/jfreereport/ExternalProject_jfreereport_libformula.mk
index 6acebfb9b461..4b0a21198e34 100644
--- a/external/jfreereport/ExternalProject_jfreereport_libformula.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_libformula.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libformula,\
$(call gb_ExternalProject_get_state_target,jfreereport_libformula,build) :
$(call gb_ExternalProject_run,build,\
$(ICECREAM_RUN) "$(ANT)" \
- -q \
+ $(if $(verbose),-v,-q) \
-f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
diff --git a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
index 0789a5475219..831711dd44c8 100644
--- a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_liblayout,\
$(call gb_ExternalProject_get_state_target,jfreereport_liblayout,build) :
$(call gb_ExternalProject_run,build,\
$(ICECREAM_RUN) "$(ANT)" \
- -q \
+ $(if $(verbose),-v,-q) \
-f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
$(if $(SYSTEM_APACHE_COMMONS),\
diff --git a/external/jfreereport/ExternalProject_jfreereport_libloader.mk b/external/jfreereport/ExternalProject_jfreereport_libloader.mk
index f2586c3caabb..02e913b2bff9 100644
--- a/external/jfreereport/ExternalProject_jfreereport_libloader.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_libloader.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libloader,\
$(call gb_ExternalProject_get_state_target,jfreereport_libloader,build) :
$(call gb_ExternalProject_run,build,\
$(ICECREAM_RUN) "$(ANT)" \
- -q \
+ $(if $(verbose),-v,-q) \
-f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
diff --git a/external/jfreereport/ExternalProject_jfreereport_librepository.mk b/external/jfreereport/ExternalProject_jfreereport_librepository.mk
index 360d6c7a88e6..046aba46aad4 100644
--- a/external/jfreereport/ExternalProject_jfreereport_librepository.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_librepository.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_librepository,\
$(call gb_ExternalProject_get_state_target,jfreereport_librepository,build) :
$(call gb_ExternalProject_run,build,\
$(ICECREAM_RUN) "$(ANT)" \
- -q \
+ $(if $(verbose),-v,-q) \
-f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
diff --git a/external/jfreereport/ExternalProject_jfreereport_libserializer.mk b/external/jfreereport/ExternalProject_jfreereport_libserializer.mk
index d4ea7024989e..5bf76573f001 100644
--- a/external/jfreereport/ExternalProject_jfreereport_libserializer.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_libserializer.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libserializer,\
$(call gb_ExternalProject_get_state_target,jfreereport_libserializer,build) :
$(call gb_ExternalProject_run,build,\
$(ICECREAM_RUN) "$(ANT)" \
- -q \
+ $(if $(verbose),-v,-q) \
-f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)." \
-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
diff --git a/external/jfreereport/ExternalProject_jfreereport_libxml.mk b/external/jfreereport/ExternalProject_jfreereport_libxml.mk
index 86c42bce32b1..fd4b6d832cc7 100644
--- a/external/jfreereport/ExternalProject_jfreereport_libxml.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_libxml.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libxml,\
$(call gb_ExternalProject_get_state_target,jfreereport_libxml,build) :
$(call gb_ExternalProject_run,build,\
$(ICECREAM_RUN) "$(ANT)" \
- -q \
+ $(if $(verbose),-v,-q) \
-f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
diff --git a/external/jfreereport/ExternalProject_jfreereport_sac.mk b/external/jfreereport/ExternalProject_jfreereport_sac.mk
index 35a0c9ddc2a2..f6aeee2ad271 100644
--- a/external/jfreereport/ExternalProject_jfreereport_sac.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_sac.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_sac,\
$(call gb_ExternalProject_get_state_target,jfreereport_sac,build) :
$(call gb_ExternalProject_run,build,\
$(ICECREAM_RUN) "$(ANT)" \
- -q \
+ $(if $(verbose),-v,-q) \
-f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
diff --git a/external/languagetool/ExternalProject_languagetool.mk b/external/languagetool/ExternalProject_languagetool.mk
index 6b3788d12e93..ccca669f66f0 100644
--- a/external/languagetool/ExternalProject_languagetool.mk
+++ b/external/languagetool/ExternalProject_languagetool.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_ExternalProject_use_jars,languagetool,\
$(call gb_ExternalProject_get_state_target,languagetool,build) :
cd "$(call gb_UnpackedTarball_get_dir,languagetool)" && \
$(ICECREAM_RUN) "$(ANT)" \
- -q \
+ $(if $(verbose),-v,-q) \
-f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
diff --git a/external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk b/external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk
index c6d539ce5fb2..8dbd910d665c 100644
--- a/external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk
+++ b/external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk
@@ -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_run,build,\
$(ICECREAM_RUN) "$(ANT)" \
- -q \
+ $(if $(verbose),-v,-q) \
-f build.xml \
-Dsdk.dir=$(ANDROID_SDK_HOME) -Dtarget=android-22 \
release \
diff --git a/external/rhino/ExternalProject_rhino.mk b/external/rhino/ExternalProject_rhino.mk
index 4f6cab6c873d..133b04f89e22 100644
--- a/external/rhino/ExternalProject_rhino.mk
+++ b/external/rhino/ExternalProject_rhino.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,rhino,\
$(call gb_ExternalProject_get_state_target,rhino,build) :
$(call gb_ExternalProject_run,build,\
$(ICECREAM_RUN) "$(ANT)" \
- -q \
+ $(if $(verbose),-v,-q) \
-f build.xml \
-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))" \
More information about the Libreoffice-commits
mailing list