RepositoryExternal.mk | 4 ++-- config_host.mk.in | 1 + configure.ac | 6 ++++-- external/apache-commons/ExternalPackage_apache_commons_logging.mk | 2 +- external/apache-commons/ExternalProject_apache_commons_httpclient.mk | 2 +- external/jfreereport/ExternalProject_jfreereport_flow_engine.mk | 2 +- external/jfreereport/ExternalProject_jfreereport_liblayout.mk | 2 +- swext/Extension_wiki-publisher.mk | 2 +- 8 files changed, 12 insertions(+), 9 deletions(-)
New commits: commit d8a7f72bab1745cbf122400d81380ed66a6c36fc Author: rbuj <robert....@gmail.com> Date: Mon Aug 18 13:52:32 2014 +0200 Use COMMONS_LOGGING_VERSION vble Change-Id: I0c76ec7e3f9b95166b4005dd1ad5349b3889c3e4 Reviewed-on: https://gerrit.libreoffice.org/10993 Reviewed-by: Thomas Arnhold <tho...@arnhold.org> Tested-by: Thomas Arnhold <tho...@arnhold.org> diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 16772512..05e1e05 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3512,7 +3512,7 @@ else # !SYSTEM_APACHE_COMMONS ifeq ($(ENABLE_JAVA),TRUE) $(eval $(call gb_Helper_register_jars_for_install,OOO,reportbuilder,\ - commons-logging-1.2 \ + commons-logging-$(COMMONS_LOGGING_VERSION) \ )) endif $(eval $(call gb_Helper_register_jars,OXT,\ @@ -3553,7 +3553,7 @@ endef define gb_Jar__use_commons-logging $(call gb_Jar_use_external_project,$(1),apache_commons_logging) -$(call gb_Jar_use_jar,$(1),commons-logging-1.2) +$(call gb_Jar_use_jar,$(1),commons-logging-$(COMMONS_LOGGING_VERSION)) endef define gb_ExternalProject__use_commons-logging $(call gb_ExternalProject_use_external_project,$(1),apache_commons_logging) diff --git a/config_host.mk.in b/config_host.mk.in index f438432..22c8da5 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -64,6 +64,7 @@ export COMMONS_CODEC_JAR=@COMMONS_CODEC_JAR@ export COMMONS_HTTPCLIENT_JAR=@COMMONS_HTTPCLIENT_JAR@ export COMMONS_LANG_JAR=@COMMONS_LANG_JAR@ export COMMONS_LOGGING_JAR=@COMMONS_LOGGING_JAR@ +export COMMONS_LOGGING_VERSION=@COMMONS_LOGGING_VERSION@ export COMPATH=@COMPATH@ export COMPILER_PLUGINS=@COMPILER_PLUGINS@ export COM_GCC_IS_CLANG=@COM_GCC_IS_CLANG@ diff --git a/configure.ac b/configure.ac index f4b7659..bc823c7 100644 --- a/configure.ac +++ b/configure.ac @@ -10865,6 +10865,7 @@ AC_SUBST(LIBSERIALIZER_JAR) # this has to be here because both the Wiki Publisher and the SRB use # commons-logging +COMMONS_LOGGING_VERSION=1.2 if test "$ENABLE_MEDIAWIKI" = "TRUE" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then AC_MSG_CHECKING([which Apache commons-* libs to use]) if test "$with_system_apache_commons" = "yes"; then @@ -10930,8 +10931,8 @@ if test "$ENABLE_MEDIAWIKI" = "TRUE" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then fi if test "$ENABLE_MEDIAWIKI" = "TRUE" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then if test -z $COMMONS_LOGGING_JAR; then - AC_CHECK_FILE(/usr/share/java/commons-logging-1.2.jar, - [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.2.jar ], + AC_CHECK_FILE(/usr/share/java/commons-logging-$(COMMONS_LOGGING_VERSION).jar, + [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-$(COMMONS_LOGGING_VERSION).jar ], [ AC_CHECK_FILE(/usr/share/java/commons-logging.jar, [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar ], @@ -10955,6 +10956,7 @@ AC_SUBST(COMMONS_CODEC_JAR) AC_SUBST(COMMONS_LANG_JAR) AC_SUBST(COMMONS_HTTPCLIENT_JAR) AC_SUBST(COMMONS_LOGGING_JAR) +AC_SUBST(COMMONS_LOGGING_VERSION) # scripting provider for BeanShell? AC_MSG_CHECKING([whether to build support for scripts in BeanShell]) diff --git a/external/apache-commons/ExternalPackage_apache_commons_logging.mk b/external/apache-commons/ExternalPackage_apache_commons_logging.mk index ce72112..2bff13b 100644 --- a/external/apache-commons/ExternalPackage_apache_commons_logging.mk +++ b/external/apache-commons/ExternalPackage_apache_commons_logging.mk @@ -11,6 +11,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,apache_commons_logging,apache_c $(eval $(call gb_ExternalPackage_use_external_project,apache_commons_logging,apache_commons_logging)) -$(eval $(call gb_ExternalPackage_add_file,apache_commons_logging,$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-1.2.jar,target/commons-logging-1.2.jar)) +$(eval $(call gb_ExternalPackage_add_file,apache_commons_logging,$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-$(COMMONS_LOGGING_VERSION).jar,target/commons-logging-$(COMMONS_LOGGING_VERSION).jar)) # vim: set noet sw=4 ts=4: diff --git a/external/apache-commons/ExternalProject_apache_commons_httpclient.mk b/external/apache-commons/ExternalProject_apache_commons_httpclient.mk index ff2733a..c2cec42 100644 --- a/external/apache-commons/ExternalProject_apache_commons_httpclient.mk +++ b/external/apache-commons/ExternalProject_apache_commons_httpclient.mk @@ -23,7 +23,7 @@ $(call gb_ExternalProject_get_state_target,apache_commons_httpclient,build) : -q \ -f build.xml \ -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ - -Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.2.jar" \ + -Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-$(COMMONS_LOGGING_VERSION).jar" \ $(if $(filter TRUE,$(HAVE_JAVA6))\ ,-Dcommons-codec.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_codec)/dist/commons-codec-1.9.jar" \ ,-Dcommons-codec.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_codec)/dist/commons-codec-1.6-SNAPSHOT.jar" \ diff --git a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk index 9245ae1..ec732e6 100644 --- a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk +++ b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk @@ -25,7 +25,7 @@ $(call gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) : -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ $(if $(SYSTEM_APACHE_COMMONS),\ -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR), \ - -Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.2.jar") \ + -Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-$(COMMONS_LOGGING_VERSION).jar") \ -Dlibbase.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libbase)/dist/libbase-$(LIBBASE_VERSION).jar \ -Dlibformula.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libformula)/dist/libformula-$(LIBFORMULA_VERSION).jar \ -Dliblayout.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_liblayout)/build/lib/liblayout.jar \ diff --git a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk index 38e4f9f..751b893 100644 --- a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk +++ b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk @@ -37,7 +37,7 @@ $(call gb_ExternalProject_get_state_target,jfreereport_liblayout,build) : -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ $(if $(SYSTEM_APACHE_COMMONS),\ -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR), \ - -Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.2.jar") \ + -Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-$(COMMONS_LOGGING_VERSION).jar") \ -Dflute.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_flute)/dist/flute-$(FLUTE_VERSION).jar \ -Dlibbase.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libbase)/dist/libbase-$(LIBBASE_VERSION).jar \ -Dlibformula.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libformula)/dist/libformula-$(LIBFORMULA_VERSION).jar \ diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk index 1c52b43..ffee9ac 100644 --- a/swext/Extension_wiki-publisher.mk +++ b/swext/Extension_wiki-publisher.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Extension_add_file,wiki-publisher,commons-httpclient-3.1.jar,$( $(eval $(call gb_Extension_add_file,wiki-publisher,$(if $(filter TRUE,$(HAVE_JAVA6)),commons-lang3-3.3.1.jar,commons-lang-2.4.jar),\ $(call gb_UnpackedTarball_get_dir,apache_commons_lang)$(if $(filter TRUE,$(HAVE_JAVA6)),/target/commons-lang3-3.3.1.jar,/dist/commons-lang-2.4.jar)\ )) -$(eval $(call gb_Extension_add_file,wiki-publisher,commons-logging-1.2.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.2.jar)) +$(eval $(call gb_Extension_add_file,wiki-publisher,commons-logging-$(COMMONS_LOGGING_VERSION).jar,$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-$(COMMONS_LOGGING_VERSION).jar)) endif $(eval $(call gb_Extension_add_file,wiki-publisher,Addons.xcu,$(call gb_XcuFile_for_extension,swext/mediawiki/src/registry/data/org/openoffice/Office/Addons.xcu))) $(eval $(call gb_Extension_add_file,wiki-publisher,Filter.xcu,$(SRCDIR)/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu)) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits