diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-03 14:11:00 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-03 14:18:59 +0100 |
| commit | a72a7dc500ffd57662e8b9be61e4676266861c33 (patch) | |
| tree | 6cc21e11fbaec37563ad42d5749f103c0a635146 /scripting/Jar_ScriptProviderForBeanShell.mk | |
| parent | 7a17b2b9d0e9bc0a95ba8bee72c2b24fb529005b (diff) | |
fdo#42312: Change bsh and js script providers from extensions to optional modules.
Their jar files reference other non-URE jars, so they cannot be extensions.
bsh.jar has been moved into the optional module (it used to be installed
always, but it looks like only the bsh script provider needs it; also, it
had been added to URE_MORE_JAVA_CLASSPATH_URLS if SYSTEM_BSH, which also
appears unnecessary as it is mentioned with an absolute file URL in the
Class-Path of the script provider jar).
js.jar has been included in the optional module (it used to be not installed
at all?).
Diffstat (limited to 'scripting/Jar_ScriptProviderForBeanShell.mk')
| -rw-r--r-- | scripting/Jar_ScriptProviderForBeanShell.mk | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/scripting/Jar_ScriptProviderForBeanShell.mk b/scripting/Jar_ScriptProviderForBeanShell.mk index ef064ae7171e..753ea101546a 100644 --- a/scripting/Jar_ScriptProviderForBeanShell.mk +++ b/scripting/Jar_ScriptProviderForBeanShell.mk @@ -39,12 +39,20 @@ $(eval $(call gb_Jar_add_jars,ScriptProviderForBeanShell,\ $(eval $(call gb_Jar_use_externals,ScriptProviderForBeanShell,\ bsh \ )) + +$(eval $(call gb_Jar_set_manifest,ScriptProviderForBeanShell,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/beanshell/MANIFEST.MF)) + +#TODO: Ensure "file://$(BSH_JAR)" is a proper file URL: ifeq ($(SYSTEM_BSH),YES) -$(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell,\ - $(BSH_JAR) \ -)) +$(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell, \ + unoil.jar ScriptFramework.jar file://$(BSH_JAR))) +else +$(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell, \ + unoil.jar ScriptFramework.jar bsh.jar)) endif +$(eval $(call gb_Jar_set_componentfile,ScriptProviderForBeanShell,scripting/java/ScriptProviderForBeanShell,OOO)) + $(eval $(call gb_Jar_set_packageroot,ScriptProviderForBeanShell,com)) $(eval $(call gb_Jar_add_sourcefiles,ScriptProviderForBeanShell,\ |