fdo#46102: Fix scripting jar manifests after gbuild'ification

scripting/Jar_ScriptFramework.mk

@@ -37,6 +37,8 @@ $(eval $(call gb_Jar_add_jars,ScriptFramework,\
 
 $(eval $(call gb_Jar_set_componentfile,ScriptFramework,scripting/java/ScriptFramework,OOO))
 
+$(eval $(call gb_Jar_set_manifest,ScriptFramework,$(SRCDIR)/scripting/java/Framework/MANIFEST.MF))
+
 $(eval $(call gb_Jar_set_packageroot,ScriptFramework,com))
 
 $(eval $(call gb_Jar_add_sourcefiles,ScriptFramework,\

scripting/Jar_ScriptProviderForBeanShell.mk

@@ -45,10 +45,10 @@ $(eval $(call gb_Jar_set_manifest,ScriptProviderForBeanShell,$(SRCDIR)/scripting
 #TODO: Ensure "file://$(BSH_JAR)" is a proper file URL:
 ifeq ($(SYSTEM_BSH),YES)
 $(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell, \
-    unoil.jar ScriptFramework.jar file://$(BSH_JAR)))
+    ScriptFramework.jar file://$(BSH_JAR)))
 else
 $(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell, \
-    unoil.jar ScriptFramework.jar bsh.jar))
+    ScriptFramework.jar bsh.jar))
 endif
 
 $(eval $(call gb_Jar_set_componentfile,ScriptProviderForBeanShell,scripting/java/ScriptProviderForBeanShell,OOO))

scripting/Jar_ScriptProviderForJava.mk

@@ -38,6 +38,11 @@ $(eval $(call gb_Jar_add_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))
 
 $(eval $(call gb_Jar_add_sourcefiles,ScriptProviderForJava,\

scripting/Jar_ScriptProviderForJavaScript.mk

@@ -40,7 +40,7 @@ $(eval $(call gb_Jar_add_jars,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, \
-    unoil.jar ScriptFramework.jar js.jar))
+    ScriptFramework.jar js.jar))
 
 $(eval $(call gb_Jar_set_componentfile,ScriptProviderForJavaScript,scripting/java/ScriptProviderForJavaScript,OOO))
 

scripting/java/Framework/MANIFEST.MF

+RegistrationClassName: com.sun.star.script.framework.security.SecurityDialog
+UNO-Type-Path: 

scripting/java/com/sun/star/script/framework/provider/java/MANIFEST.MF

+RegistrationClassName: com.sun.star.script.framework.provider.java.ScriptProviderForJava
+UNO-Type-Path: