ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

gbuild: remove most uses of gb_Jar_set_jarclasspath:

Browse Source 
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
This commit is contained in:
Michael Stahl
2012-08-15 21:29:14 +02:00
parent 8b8e749fae
commit cdbd6957a5
29 changed files with 20 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
accessibility/Jar_uno_accessbridge.mk
-4
View File
@@ -38,10 +38,6 @@ $(eval $(call gb_Jar_set_packageroot,java_uno_accessbridge,org))
$(eval $(call gb_Jar_set_manifest,java_uno_accessbridge,$(SRCDIR)/accessibility/bridge/org/openoffice/accessibility/manifest))
$(eval $(call gb_Jar_set_jarclasspath,java_uno_accessbridge,\
$$(JARCLASSPATH) \
))
$(eval $(call gb_Jar_set_componentfile,java_uno_accessbridge,accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge,OOO))
$(eval $(call gb_Jar_add_sourcefiles,java_uno_accessbridge,\
connectivity/Jar_sdbc_hsqldb.mk
+2 -3
View File
@@ -37,9 +37,8 @@ $(eval $(call gb_Jar_use_jars,sdbc_hsqldb,\
))
endif
$(eval $(call gb_Jar_set_jarclasspath,sdbc_hsqldb,\
hsqldb.jar \
$(HSQLDB_JAR) \
# FIXME: is this really necessary?
$(eval $(call gb_Jar_add_manifest_classpath,sdbc_hsqldb,\
.. \
))
filter/Jar_XSLTFilter.mk
-2
View File
@@ -31,8 +31,6 @@ $(eval $(call gb_Jar_set_componentfile,XSLTFilter,filter/source/xsltfilter/XSLTF
$(eval $(call gb_Jar_set_manifest,XSLTFilter,$(SRCDIR)/filter/source/xsltfilter/Manifest))
$(eval $(call gb_Jar_set_jarclasspath,XSLTFilter,saxon9.jar))
$(eval $(call gb_Jar_set_packageroot,XSLTFilter,com))
$(eval $(call gb_Jar_add_sourcefiles,XSLTFilter,\
javaunohelper/Jar_juh.mk
+1 -1
View File
@@ -35,7 +35,7 @@ $(eval $(call gb_Jar_use_jars,juh,\
$(eval $(call gb_Jar_set_packageroot,juh,com))
$(eval $(call gb_Jar_set_jarclasspath,juh,ridl.jar jurt.jar ../../lib/ ../bin/))
$(eval $(call gb_Jar_add_manifest_classpath,juh,ridl.jar jurt.jar ../../lib/ ../bin/))
$(eval $(call gb_Jar_set_manifest,juh,$(SRCDIR)/javaunohelper/util/manifest))
jurt/Jar_jurt.mk
+1 -1
View File
@@ -36,7 +36,7 @@ $(eval $(call gb_Jar_set_packageroot,jurt,com))
$(eval $(call gb_Jar_set_manifest,jurt,$(SRCDIR)/jurt/util/manifest))
$(eval $(call gb_Jar_set_jarclasspath,jurt, \
$(eval $(call gb_Jar_add_manifest_classpath,jurt, \
ridl.jar unoloader.jar ../../lib/ ../bin/))
$(eval $(call gb_Jar_add_sourcefiles,jurt,\
nlpsolver/Jar_nlpsolver.mk
-4
View File
@@ -41,10 +41,6 @@ $(eval $(call gb_Jar_set_packageroot,nlpsolver,com))
$(eval $(call gb_Jar_set_manifest,nlpsolver,$(SRCDIR)/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/Manifest.mf))
$(eval $(call gb_Jar_set_jarclasspath,nlpsolver,\
EvolutionarySolver.jar \
))
$(eval $(call gb_Jar_add_sourcefiles,nlpsolver,\
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/Registration \
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/PropertyInfo \
qadevOOo/Jar_OOoRunner.mk
+1 -1
View File
@@ -32,7 +32,7 @@ gb_JavaClassSet_JAVACDEBUG:= -g
$(eval $(call gb_Jar_Jar,OOoRunner))
$(eval $(call gb_Jar_set_jarclasspath,OOoRunner,\
$(eval $(call gb_Jar_add_manifest_classpath,OOoRunner,\
ridl.jar \
unoil.jar \
))
qadevOOo/Jar_OOoRunnerLight.mk
+1 -1
View File
@@ -32,7 +32,7 @@ gb_JavaClassSet_JAVACDEBUG := -g
$(eval $(call gb_Jar_Jar,OOoRunnerLight))
$(eval $(call gb_Jar_set_jarclasspath,OOoRunnerLight,\
$(eval $(call gb_Jar_add_manifest_classpath,OOoRunnerLight,\
ridl.jar \
unoil.jar \
))
reportbuilder/Jar_reportbuilder.mk
-34
View File
@@ -50,40 +50,6 @@ $(eval $(call gb_Jar_use_externals,sun-report-builder,\
sac \
))
$(eval $(call gb_Jar_set_jarclasspath,sun-report-builder,\
$(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),\
$(call gb_Helper_make_url,$(COMMONS_LOGGING_JAR)),\
commons-logging-1.1.1.jar \
) \
$(if $(filter YES,$(SYSTEM_JFREEREPORT)),\
$(foreach jar,\
$(FLUTE_JAR) \
$(JFREEREPORT_JAR) \
$(LIBBASE_JAR) \
$(LIBFONTS_JAR) \
$(LIBFORMULA_JAR) \
$(LIBLAYOUT_JAR) \
$(LIBLOADER_JAR) \
$(LIBREPOSITORY_JAR) \
$(LIBSERIALIZER_JAR) \
$(LIBXML_JAR) \
$(SAC_JAR) \
,$(call gb_Helper_make_url,$(jar)) \
),\
flow-engine-0.9.4.jar \
flute-1.1.6.jar \
libbase-1.1.6.jar \
libfonts-1.1.6.jar \
libformula-1.1.7.jar \
liblayout-0.2.10.jar \
libloader-1.1.6.jar \
librepository-1.1.6.jar \
libserializer-1.1.6.jar \
libxml-1.1.7.jar \
sac.jar \
) \
))
$(eval $(call gb_Jar_set_manifest,sun-report-builder,$(SRCDIR)/reportbuilder/util/manifest.mf))
$(eval $(call gb_Jar_set_packageroot,sun-report-builder,com))
scripting/Jar_ScriptProviderForBeanShell.mk
-5
View File
@@ -42,11 +42,6 @@ $(eval $(call gb_Jar_use_externals,ScriptProviderForBeanShell,\
$(eval $(call gb_Jar_set_manifest,ScriptProviderForBeanShell,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/beanshell/MANIFEST.MF))
$(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell, \
ScriptFramework.jar \
$(if $(filter-out YES,$(SYSTEM_BSH)),bsh.jar) \
))
$(eval $(call gb_Jar_set_componentfile,ScriptProviderForBeanShell,scripting/java/ScriptProviderForBeanShell,OOO))
$(eval $(call gb_Jar_set_packageroot,ScriptProviderForBeanShell,com))
scripting/Jar_ScriptProviderForJava.mk
-3
View File
@@ -38,9 +38,6 @@ $(eval $(call gb_Jar_use_jars,ScriptProviderForJava,\
$(eval $(call gb_Jar_set_componentfile,ScriptProviderForJava,scripting/java/ScriptProviderForJava,OOO))
$(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForJava, \
ScriptFramework.jar))
$(eval $(call gb_Jar_set_manifest,ScriptProviderForJava,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/java/MANIFEST.MF))
$(eval $(call gb_Jar_set_packageroot,ScriptProviderForJava,com))
scripting/Jar_ScriptProviderForJavaScript.mk
-5
View File
@@ -42,11 +42,6 @@ $(eval $(call gb_Jar_use_externals,ScriptProviderForJavaScript,\
$(eval $(call gb_Jar_set_manifest,ScriptProviderForJavaScript,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/javascript/MANIFEST.MF))
$(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForJavaScript, \
ScriptFramework.jar \
$(if $(filter-out YES,$(SYSTEM_RHINO)),js.jar) \
))
$(eval $(call gb_Jar_set_componentfile,ScriptProviderForJavaScript,scripting/java/ScriptProviderForJavaScript,OOO))
$(eval $(call gb_Jar_set_packageroot,ScriptProviderForJavaScript,com))
smoketest/Jar_TestExtension.mk
+1 -1
View File
@@ -29,7 +29,7 @@ $(eval $(call gb_Jar_Jar,TestExtension))
$(eval $(call gb_Jar_set_manifest,TestExtension,$(SRCDIR)/smoketest/com/sun/star/comp/smoketest/MANIFEST.MF))
$(eval $(call gb_Jar_set_jarclasspath,TestExtension,\
$(eval $(call gb_Jar_add_manifest_classpath,TestExtension,\
juh.jar \
jurt.jar \
ridl.jar \
solenv/gbuild/Jar.mk
+7 -2
View File
@@ -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
swext/Jar_mediawiki.mk
-14
View File
@@ -42,20 +42,6 @@ $(eval $(call gb_Jar_use_jars,mediawiki,\
$(COMMONS_HTTPCLIENT_JAR) \
$(COMMONS_LOGGING_JAR) \
))
# Class-Path: in MANIFEST.MF
$(eval $(call gb_Jar_set_jarclasspath,mediawiki,\
$(COMMONS_CODEC_JAR) \
$(COMMONS_LANG_JAR) \
$(COMMONS_HTTPCLIENT_JAR) \
$(COMMONS_LOGGING_JAR) \
))
else
$(eval $(call gb_Jar_set_jarclasspath,mediawiki,\
commons-codec-1.3.jar \
commons-lang-2.3.jar \
commons-httpclient-3.1.jar \
commons-logging-1.1.1.jar \
))
endif
$(eval $(call gb_Jar_use_jars,mediawiki,\
unotest/Jar_test-tools.mk
+1 -1
View File
@@ -27,7 +27,7 @@
$(eval $(call gb_Jar_Jar,test-tools))
$(eval $(call gb_Jar_set_jarclasspath,test-tools,\
$(eval $(call gb_Jar_add_manifest_classpath,test-tools,\
juh.jar \
ridl.jar \
unoil.jar \
unotest/Jar_test.mk
+1 -1
View File
@@ -27,7 +27,7 @@
$(eval $(call gb_Jar_Jar,test))
$(eval $(call gb_Jar_set_jarclasspath,test,\
$(eval $(call gb_Jar_add_manifest_classpath,test,\
juh.jar \
ridl.jar \
unoil.jar \
wizards/Jar_agenda.mk
-4
View File
@@ -39,10 +39,6 @@ $(eval $(call gb_Jar_use_jars,agenda,\
$(eval $(call gb_Jar_set_manifest,agenda,$(SRCDIR)/wizards/com/sun/star/wizards/agenda/MANIFEST.MF))
$(eval $(call gb_Jar_set_jarclasspath,agenda,\
commonwizards.jar \
))
$(eval $(call gb_Jar_set_packageroot,agenda,com))
$(eval $(call gb_Jar_add_sourcefiles,agenda,\
wizards/Jar_commonwizards.mk
+2 -1
View File
@@ -40,7 +40,8 @@ $(eval $(call gb_Jar_set_packageroot,commonwizards,com))
$(eval $(call gb_Jar_set_manifest,commonwizards,$(SRCDIR)/wizards/com/sun/star/wizards/common/MANIFEST.MF))
$(eval $(call gb_Jar_set_jarclasspath,commonwizards,saxon9.jar))
# FIXME: what is this doing here?
$(eval $(call gb_Jar_add_manifest_classpath,commonwizards,saxon9.jar))
$(eval $(call gb_Jar_add_sourcefiles,commonwizards,\
wizards/com/sun/star/wizards/common/HelpIds \
wizards/Jar_fax.mk
-4
View File
@@ -41,10 +41,6 @@ $(eval $(call gb_Jar_set_packageroot,fax,com))
$(eval $(call gb_Jar_set_manifest,fax,$(SRCDIR)/wizards/com/sun/star/wizards/fax/MANIFEST.MF))
$(eval $(call gb_Jar_set_jarclasspath,fax,\
commonwizards.jar \
))
$(eval $(call gb_Jar_add_sourcefiles,fax,\
wizards/com/sun/star/wizards/fax/CallWizard \
wizards/com/sun/star/wizards/fax/CGFax \
wizards/Jar_form.mk
-4
View File
@@ -41,10 +41,6 @@ $(eval $(call gb_Jar_set_manifest,form,$(SRCDIR)/wizards/com/sun/star/wizards/fo
$(eval $(call gb_Jar_set_packageroot,form,com))
$(eval $(call gb_Jar_set_jarclasspath,form,\
commonwizards.jar \
))
$(eval $(call gb_Jar_add_sourcefiles,form,\
wizards/com/sun/star/wizards/form/CallFormWizard \
wizards/com/sun/star/wizards/form/DataEntrySetter \
wizards/Jar_letter.mk
-4
View File
@@ -41,10 +41,6 @@ $(eval $(call gb_Jar_set_manifest,letter,$(SRCDIR)/wizards/com/sun/star/wizards/
$(eval $(call gb_Jar_set_packageroot,letter,com))
$(eval $(call gb_Jar_set_jarclasspath,letter,\
commonwizards.jar \
))
$(eval $(call gb_Jar_add_sourcefiles,letter,\
wizards/com/sun/star/wizards/letter/CallWizard \
wizards/com/sun/star/wizards/letter/CGLetter \
wizards/Jar_query.mk
-4
View File
@@ -40,10 +40,6 @@ $(eval $(call gb_Jar_set_manifest,query,$(SRCDIR)/wizards/com/sun/star/wizards/q
$(eval $(call gb_Jar_set_packageroot,query,com))
$(eval $(call gb_Jar_set_jarclasspath,query,\
commonwizards.jar \
))
$(eval $(call gb_Jar_add_sourcefiles,query,\
wizards/com/sun/star/wizards/query/CallQueryWizard \
wizards/com/sun/star/wizards/query/Finalizer \
wizards/Jar_report.mk
-4
View File
@@ -41,10 +41,6 @@ $(eval $(call gb_Jar_set_manifest,report,$(SRCDIR)/wizards/com/sun/star/wizards/
$(eval $(call gb_Jar_set_packageroot,report,com))
$(eval $(call gb_Jar_set_jarclasspath,report,\
commonwizards.jar \
))
$(eval $(call gb_Jar_add_sourcefiles,report,\
wizards/com/sun/star/wizards/report/CallReportWizard \
wizards/com/sun/star/wizards/report/Dataimport \
wizards/Jar_reportbuilder.mk
-5
View File
@@ -42,11 +42,6 @@ $(eval $(call gb_Jar_set_packageroot,reportbuilderwizard,com))
$(eval $(call gb_Jar_set_manifest,reportbuilderwizard,$(SRCDIR)/wizards/com/sun/star/wizards/reportbuilder/MANIFEST.MF))
$(eval $(call gb_Jar_set_jarclasspath,reportbuilderwizard,\
commonwizards.jar \
report.jar \
))
$(eval $(call gb_Jar_add_sourcefiles,reportbuilderwizard,\
wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation \
wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn \
wizards/Jar_table.mk
-4
View File
@@ -41,10 +41,6 @@ $(eval $(call gb_Jar_set_packageroot,table,com))
$(eval $(call gb_Jar_set_manifest,table,$(SRCDIR)/wizards/com/sun/star/wizards/table/MANIFEST.MF))
$(eval $(call gb_Jar_set_jarclasspath,table,\
commonwizards.jar \
))
$(eval $(call gb_Jar_add_sourcefiles,table,\
wizards/com/sun/star/wizards/table/CallTableWizard \
wizards/com/sun/star/wizards/table/CGCategory \
wizards/Jar_web.mk
-4
View File
@@ -41,10 +41,6 @@ $(eval $(call gb_Jar_set_packageroot,web,com))
$(eval $(call gb_Jar_set_manifest,web,$(SRCDIR)/wizards/com/sun/star/wizards/web/MANIFEST.MF))
$(eval $(call gb_Jar_set_jarclasspath,web,\
commonwizards.jar \
))
$(eval $(call gb_Jar_add_sourcefiles,web,\
wizards/com/sun/star/wizards/web/AbstractErrorHandler \
wizards/com/sun/star/wizards/web/BackgroundsDialog \
xmerge/Jar_XMergeBridge.mk
-4
View File
@@ -35,10 +35,6 @@ $(eval $(call gb_Jar_set_manifest,XMergeBridge,$(SRCDIR)/xmerge/source/bridge/ma
$(eval $(call gb_Jar_set_packageroot,XMergeBridge,*.class))
$(eval $(call gb_Jar_set_jarclasspath,XMergeBridge,\
xmerge.jar \
))
$(eval $(call gb_Jar_use_jars,XMergeBridge,\
$(OUTDIR)/bin/xmerge.jar \
$(OUTDIR)/bin/unoil.jar \
xmerge/Jar_xmerge.mk
+2 -1
View File
@@ -38,7 +38,8 @@ $(eval $(call gb_Jar_use_jars,xmerge,\
$(OUTDIR)/bin/juh.jar \
))
$(eval $(call gb_Jar_set_jarclasspath,xmerge,\
# FIXME: what is this stuff good for???
$(eval $(call gb_Jar_add_manifest_classpath,xmerge,\
xml-apis.jar \
xercesImpl.jar \
serializer.jar \