From a72a7dc500ffd57662e8b9be61e4676266861c33 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 3 Nov 2011 14:11:00 +0100 Subject: 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?). --- scripting/Jar_ScriptProviderForJavaScript.mk | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'scripting/Jar_ScriptProviderForJavaScript.mk') diff --git a/scripting/Jar_ScriptProviderForJavaScript.mk b/scripting/Jar_ScriptProviderForJavaScript.mk index 93ab3e10f315..5f690858ec16 100644 --- a/scripting/Jar_ScriptProviderForJavaScript.mk +++ b/scripting/Jar_ScriptProviderForJavaScript.mk @@ -37,6 +37,13 @@ $(eval $(call gb_Jar_add_jars,ScriptProviderForJavaScript,\ $(OUTDIR)/bin/js.jar \ )) +$(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, \ + unoil.jar ScriptFramework.jar js.jar)) + +$(eval $(call gb_Jar_set_componentfile,ScriptProviderForJavaScript,scripting/java/ScriptProviderForJavaScript,OOO)) + $(eval $(call gb_Jar_set_packageroot,ScriptProviderForJavaScript,com)) $(eval $(call gb_Jar_add_sourcefiles,ScriptProviderForJavaScript,\ -- cgit v1.2.3