diff options
author | Michael Stahl <mstahl@redhat.com> | 2012-08-15 17:41:25 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-08-15 21:29:14 +0200 |
commit | a455126868f466b8f0e6b3a354dbe88770258913 (patch) | |
tree | d10d7fb68527c8541787f13a217596897f0e6acd /RepositoryExternal.mk | |
parent | 49357140beef3b2b3d0b22fa4eea8bf9add73eda (diff) |
gbuild: refactor external jar handling:
Using a system jar should really put the system jar onto the manifest
class-path, but that is currently difficult because externals are used
by JavaClassSet and not Jar; fortunately it seems nobody uses
gb_JavaClassSet_use_external directly so move the implementation to
gb_Jar_use_external.
Change-Id: Ieac480b3dec0ad39d2404b0a64b641eaf73c1e4a
Diffstat (limited to 'RepositoryExternal.mk')
-rw-r--r-- | RepositoryExternal.mk | 144 |
1 files changed, 72 insertions, 72 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 4b8bfe934866..39b7b73e0fc4 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1970,28 +1970,28 @@ endif # DESKTOP ifeq ($(SYSTEM_SAXON),YES) -define gb_JavaClassSet__use_saxon -$(call gb_JavaClassSet_use_system_jar,$(1),$(SAXON_JAR)) +define gb_Jar__use_saxon +$(call gb_Jar_use_system_jar,$(1),$(SAXON_JAR)) endef else # !SYSTEM_SAXON -define gb_JavaClassSet__use_saxon -$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/saxon9.jar) +define gb_Jar__use_saxon +$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/saxon9.jar) endef endif # SYSTEM_SAXON ifeq ($(SYSTEM_BSH),YES) -define gb_JavaClassSet__use_bsh -$(call gb_JavaClassSet_use_system_jar,$(1),$(BSH_JAR)) +define gb_Jar__use_bsh +$(call gb_Jar_use_system_jar,$(1),$(BSH_JAR)) endef else # !SYSTEM_BSH -define gb_JavaClassSet__use_bsh -$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/bsh.jar) +define gb_Jar__use_bsh +$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/bsh.jar) endef endif # SYSTEM_BSH @@ -1999,52 +1999,52 @@ endif # SYSTEM_BSH ifeq ($(SYSTEM_RHINO),YES) -define gb_JavaClassSet__use_rhino -$(call gb_JavaClassSet_use_system_jar,$(1),$(RHINO_JAR)) +define gb_Jar__use_rhino +$(call gb_Jar_use_system_jar,$(1),$(RHINO_JAR)) endef else # !SYSTEM_RHINO -define gb_JavaClassSet__use_rhino -$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/js.jar) +define gb_Jar__use_rhino +$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/js.jar) endef endif # SYSTEM_RHINO ifeq ($(SYSTEM_APACHE_COMMONS),YES) -define gb_JavaClassSet__use_commons-codec -$(call gb_JavaClassSet_use_system_jar,$(1),$(COMMONS_CODEC_JAR)) +define gb_Jar__use_commons-codec +$(call gb_Jar_use_system_jar,$(1),$(COMMONS_CODEC_JAR)) endef -define gb_JavaClassSet__use_commons-httpclient -$(call gb_JavaClassSet_use_system_jar,$(1),$(COMMONS_HTTPCLIENT_JAR)) +define gb_Jar__use_commons-httpclient +$(call gb_Jar_use_system_jar,$(1),$(COMMONS_HTTPCLIENT_JAR)) endef -define gb_JavaClassSet__use_commons-lang -$(call gb_JavaClassSet_usadd_linked_libse_system_jar,$(1),$(COMMONS_LANG_JAR)) +define gb_Jar__use_commons-lang +$(call gb_Jar_usadd_linked_libse_system_jar,$(1),$(COMMONS_LANG_JAR)) endef -define gb_JavaClassSet__use_commons-logging -$(call gb_JavaClassSet_use_system_jar,$(1),$(COMMONS_LOGGING_JAR)) +define gb_Jar__use_commons-logging +$(call gb_Jar_use_system_jar,$(1),$(COMMONS_LOGGING_JAR)) endef else # !SYSTEM_APACHE_COMMONS -define gb_JavaClassSet__use_commons-codec -$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/commons-codec-1.3.jar) +define gb_Jar__use_commons-codec +$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/commons-codec-1.3.jar) endef -define gb_JavaClassSet__use_commons-httpclient -$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/commons-httpclient-3.1.jar) +define gb_Jar__use_commons-httpclient +$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/commons-httpclient-3.1.jar) endef -define gb_JavaClassSet__use_commons-lang -$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/commons-lang-2.3.jar) +define gb_Jar__use_commons-lang +$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/commons-lang-2.3.jar) endef -define gb_JavaClassSet__use_commons-logging -$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/commons-logging-1.1.1.jar) +define gb_Jar__use_commons-logging +$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/commons-logging-1.1.1.jar) endef endif # SYSTEM_APACHE_COMMONS @@ -2052,94 +2052,94 @@ endif # SYSTEM_APACHE_COMMONS ifeq ($(SYSTEM_JFREEREPORT),YES) -define gb_JavaClassSet__use_flow-engine -$(call gb_JavaClassSet_use_system_jar,$(1),$(JFREEREPORT_JAR)) +define gb_Jar__use_flow-engine +$(call gb_Jar_use_system_jar,$(1),$(JFREEREPORT_JAR)) endef -define gb_JavaClassSet__use_flute -$(call gb_JavaClassSet_use_system_jar,$(1),$(FLUTE_JAR)) +define gb_Jar__use_flute +$(call gb_Jar_use_system_jar,$(1),$(FLUTE_JAR)) endef -define gb_JavaClassSet__use_libbase -$(call gb_JavaClassSet_use_system_jar,$(1),$(LIBBASE_JAR)) +define gb_Jar__use_libbase +$(call gb_Jar_use_system_jar,$(1),$(LIBBASE_JAR)) endef -define gb_JavaClassSet__use_libfonts -$(call gb_JavaClassSet_use_system_jar,$(1),$(LIBFONTS_JAR)) +define gb_Jar__use_libfonts +$(call gb_Jar_use_system_jar,$(1),$(LIBFONTS_JAR)) endef -define gb_JavaClassSet__use_libformula -$(call gb_JavaClassSet_use_system_jar,$(1),$(LIBFORMULA_JAR)) +define gb_Jar__use_libformula +$(call gb_Jar_use_system_jar,$(1),$(LIBFORMULA_JAR)) endef -define gb_JavaClassSet__use_liblayout -$(call gb_JavaClassSet_use_system_jar,$(1),$(LIBLAYOUT_JAR)) +define gb_Jar__use_liblayout +$(call gb_Jar_use_system_jar,$(1),$(LIBLAYOUT_JAR)) endef -define gb_JavaClassSet__use_libloader -$(call gb_JavaClassSet_use_system_jar,$(1),$(LIBLOADER_JAR)) +define gb_Jar__use_libloader +$(call gb_Jar_use_system_jar,$(1),$(LIBLOADER_JAR)) endef -define gb_JavaClassSet__use_librepository -$(call gb_JavaClassSet_use_system_jar,$(1),$(LIBREPOSITORY_JAR)) +define gb_Jar__use_librepository +$(call gb_Jar_use_system_jar,$(1),$(LIBREPOSITORY_JAR)) endef -define gb_JavaClassSet__use_libserializer -$(call gb_JavaClassSet_use_system_jar,$(1),$(LIBSERIALIZER_JAR)) +define gb_Jar__use_libserializer +$(call gb_Jar_use_system_jar,$(1),$(LIBSERIALIZER_JAR)) endef -define gb_JavaClassSet__use_libxml -$(call gb_JavaClassSet_use_system_jar,$(1),$(LIBXML_JAR)) +define gb_Jar__use_libxml +$(call gb_Jar_use_system_jar,$(1),$(LIBXML_JAR)) endef -define gb_JavaClassSet__use_sac -$(call gb_JavaClassSet_use_system_jar,$(1),$(SAC_JAR)) +define gb_Jar__use_sac +$(call gb_Jar_use_system_jar,$(1),$(SAC_JAR)) endef else # !SYSTEM_JFREEREPORT -define gb_JavaClassSet__use_flow-engine -$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/flow-engine-0.9.4.jar) +define gb_Jar__use_flow-engine +$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/flow-engine-0.9.4.jar) endef -define gb_JavaClassSet__use_flute -$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/flute-1.1.6.jar) +define gb_Jar__use_flute +$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/flute-1.1.6.jar) endef -define gb_JavaClassSet__use_libbase -$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/libbase-1.1.6.jar) +define gb_Jar__use_libbase +$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/libbase-1.1.6.jar) endef -define gb_JavaClassSet__use_libfonts -$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/libfonts-1.1.6.jar) +define gb_Jar__use_libfonts +$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/libfonts-1.1.6.jar) endef -define gb_JavaClassSet__use_libformula -$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/libformula-1.1.7.jar) +define gb_Jar__use_libformula +$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/libformula-1.1.7.jar) endef -define gb_JavaClassSet__use_liblayout -$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/liblayout-0.2.10.jar) +define gb_Jar__use_liblayout +$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/liblayout-0.2.10.jar) endef -define gb_JavaClassSet__use_libloader -$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/libloader-1.1.6.jar) +define gb_Jar__use_libloader +$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/libloader-1.1.6.jar) endef -define gb_JavaClassSet__use_librepository -$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/librepository-1.1.6.jar) +define gb_Jar__use_librepository +$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/librepository-1.1.6.jar) endef -define gb_JavaClassSet__use_libserializer -$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/libserializer-1.1.6.jar) +define gb_Jar__use_libserializer +$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/libserializer-1.1.6.jar) endef -define gb_JavaClassSet__use_libxml -$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/libxml-1.1.7.jar) +define gb_Jar__use_libxml +$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/libxml-1.1.7.jar) endef -define gb_JavaClassSet__use_sac -$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/sac.jar) +define gb_Jar__use_sac +$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/sac.jar) endef endif # SYSTEM_JFREEREPORT |