diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-24 23:11:02 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-25 11:42:39 +0200 |
| commit | 7da7682965c0465a4c6ae017870daadc2b9ac099 (patch) | |
| tree | 82d4b59464b07a2311ee563995c172f4c22c443b | |
| parent | db23d4b0e3fde9aef91bd333b259092ddea58306 (diff) | |
gbuild: add gb_Jar_use_external_jar
... which is an ugly hack to handle jar files that are from externals
and are not bundled in the main instset, only in extensions.
Change-Id: I992242b7c990c24318b040e98b6632e3b78b6f63
| -rw-r--r-- | RepositoryExternal.mk | 6 | ||||
| -rw-r--r-- | solenv/gbuild/Jar.mk | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d2d060220c60..2232710872cb 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2820,21 +2820,21 @@ $(eval $(call gb_Helper_register_jars,OXT,\ )) define gb_Jar__use_commons-codec -$(call gb_Jar_use_jar,$(1),commons-codec-1.6) +$(call gb_Jar_use_external_jar,$(1),$(OUTDIR)/bin/commons-codec-1.6.jar) endef define gb_ExternalProject__use_commons-codec $(call gb_ExternalProject_use_external_project,$(1),apache_commons_codec) endef define gb_Jar__use_commons-httpclient -$(call gb_Jar_use_jar,$(1),commons-httpclient-3.1) +$(call gb_Jar_use_external_jar,$(1),$(OUTDIR)/bin/commons-httpclient-3.1.jar) endef define gb_ExternalProject__use_commons-httpclient $(call gb_ExternalProject_use_external_project,$(1),apache_commons_httpclient) endef define gb_Jar__use_commons-lang -$(call gb_Jar_use_jar,$(1),commons-lang-2.4) +$(call gb_Jar_use_external_jar,$(1),$(OUTDIR)/bin/commons-lang-2.4.jar) endef define gb_ExternalProject__use_commons-lang $(call gb_ExternalProject_use_external_project,$(1),apache_commons_lang) diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index cef34e86ffae..b71c9dcd3631 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -217,6 +217,13 @@ $(call gb_Jar_add_manifest_classpath,$(1),$(call gb_Helper_make_url,$(2))) endef +define gb_Jar_use_external_jar +$(call gb_JavaClassSet_use_system_jar,$(call gb_Jar_get_classsetname,$(1)),$(2)) +$(call gb_Jar_add_manifest_classpath,$(1),$(notdir $(2))) +$(call gb_Jar_get_target,$(1)) : $(2) + +endef + define gb_Jar_add_jars $$(call gb_Output_error,\ gb_Jar_add_jars: use gb_Jar_use_jars instead.) |