diff options
author | Michael Stahl <mstahl@redhat.com> | 2012-08-15 20:10:10 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-08-15 21:29:14 +0200 |
commit | cdbd6957a59183667f65dcb233bd9ddffd7b6e91 (patch) | |
tree | fc0e31ba2960284d0be72e7c88f133e84b20215b /solenv | |
parent | 8b8e749fae45ba41e361897b447173fb6a26eb38 (diff) |
gbuild: remove most uses of gb_Jar_set_jarclasspath:
With gb_Jar_add_jar and gb_Jar_add_system_jar adding to the manifest
classpath automatically it is no longer necessary to call
gb_Jar_set_jarclasspath manually except for the URE jars, which
are apparently not supposed to be added automatically.
Change-Id: I1e743e7ecb9cb5651e02005aa09e127bea1b0a29
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/gbuild/Jar.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index 88616a3433a8..1b9b370628ac 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -162,7 +162,8 @@ endef # JARCLASSPATH is the class path that is written to the manifest of the jar define gb_Jar_set_jarclasspath -$(call gb_Jar_get_target,$(1)) : JARCLASSPATH := $(2) +$$(call gb_Output_error,\ + gb_Jar_set_jarclasspath: use gb_Jar_add_manifest_classpath instead.) endef @@ -185,10 +186,14 @@ $$(call gb_Output_error,\ gb_Jar_add_jar: use gb_Jar_use_jar instead.) endef +# these are not added to manifest classpath +gb_Jar_default_jars := unoloader ridl jurt unoil juh java_uno + # remember: classpath is "inherited" to ClassSet define gb_Jar_use_jar $(call gb_JavaClassSet_use_jar,$(call gb_Jar_get_classsetname,$(1)),$(2)) -$(call gb_Jar_add_manifest_classpath,$(1),$(notdir $(2))) +$(if $(filter-out $(gb_Jar_default_jars),$(basename $(notdir $(2)))),\ + $(call gb_Jar_add_manifest_classpath,$(1),$(notdir $(2)))) endef |