diff options
| author | Douglas Mencken <dougmencken@gmail.com> | 2014-05-20 12:55:56 -0400 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-05-21 07:57:55 -0500 |
| commit | 7e4708739dd7a4d9db3a093a9f36d95f0192e639 (patch) | |
| tree | c266bbc501af2ec059dc387e35495f5a064b6cd7 /swext | |
| parent | e142ad49cee072e88ab47d6caa64adfa6df7d9fa (diff) | |
care for Java 1.5 support in external packages
apache commons-lang 3.3.1 and commons-codec 1.9 are for use
only with JDK 1.6 and higher
see commits:
1731f6e692bb0a07a2bca4b1b190163f209d2b9e "bump apache-commons-lang to 3.3.1"
3dad9b1019bebcc6db63a424afa146e007f768d2 "bump apache-commons-codec to 1.9"
Change-Id: I3e71f6474becafe6c91836bbac5c6a8b7ca3442c
Reviewed-on: https://gerrit.libreoffice.org/9312
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'swext')
| -rw-r--r-- | swext/Extension_wiki-publisher.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk index efc0113e2339..a3d5b2b46115 100644 --- a/swext/Extension_wiki-publisher.mk +++ b/swext/Extension_wiki-publisher.mk @@ -22,9 +22,15 @@ $(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_co $(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_httpclient)) $(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_lang)) -$(eval $(call gb_Extension_add_file,wiki-publisher,commons-codec-1.9.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_codec)/dist/commons-codec-1.9.jar)) +$(eval $(call gb_Extension_add_file,wiki-publisher,\ +$(if $(filter TRUE,$(HAVE_JAVA6)),commons-codec-1.9.jar,commons-codec-1.6.jar),\ +$(call gb_UnpackedTarball_get_dir,apache_commons_codec)$(if $(filter TRUE,$(HAVE_JAVA6)),/dist/commons-codec-1.9.jar,/dist/commons-codec-1.6-SNAPSHOT.jar)\ +)) $(eval $(call gb_Extension_add_file,wiki-publisher,commons-httpclient-3.1.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_httpclient)/dist/commons-httpclient.jar)) -$(eval $(call gb_Extension_add_file,wiki-publisher,commons-lang3-3.3.1.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_lang)/target/commons-lang3-3.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.1.3.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.3.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))) |