Kaydet (Commit) 7da76829 authored tarafından Michael Stahl's avatar Michael Stahl

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
üst db23d4b0
...@@ -2820,21 +2820,21 @@ $(eval $(call gb_Helper_register_jars,OXT,\ ...@@ -2820,21 +2820,21 @@ $(eval $(call gb_Helper_register_jars,OXT,\
)) ))
define gb_Jar__use_commons-codec 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 endef
define gb_ExternalProject__use_commons-codec define gb_ExternalProject__use_commons-codec
$(call gb_ExternalProject_use_external_project,$(1),apache_commons_codec) $(call gb_ExternalProject_use_external_project,$(1),apache_commons_codec)
endef endef
define gb_Jar__use_commons-httpclient 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 endef
define gb_ExternalProject__use_commons-httpclient define gb_ExternalProject__use_commons-httpclient
$(call gb_ExternalProject_use_external_project,$(1),apache_commons_httpclient) $(call gb_ExternalProject_use_external_project,$(1),apache_commons_httpclient)
endef endef
define gb_Jar__use_commons-lang 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 endef
define gb_ExternalProject__use_commons-lang define gb_ExternalProject__use_commons-lang
$(call gb_ExternalProject_use_external_project,$(1),apache_commons_lang) $(call gb_ExternalProject_use_external_project,$(1),apache_commons_lang)
......
...@@ -217,6 +217,13 @@ $(call gb_Jar_add_manifest_classpath,$(1),$(call gb_Helper_make_url,$(2))) ...@@ -217,6 +217,13 @@ $(call gb_Jar_add_manifest_classpath,$(1),$(call gb_Helper_make_url,$(2)))
endef 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 define gb_Jar_add_jars
$$(call gb_Output_error,\ $$(call gb_Output_error,\
gb_Jar_add_jars: use gb_Jar_use_jars instead.) gb_Jar_add_jars: use gb_Jar_use_jars instead.)
......
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