From addffddbc4acf9745e6bfeba322d6488b3c12605 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 22 Mar 2012 23:27:32 +0100
Subject: fdo#46102: Fix scripting jar manifests after gbuild'ification (cherry
 picked from commit 91d60be7eeafa1f7872bda452bfb38936003f517)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michael Stahl <mstahl@redhat.com>
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
---
 scripting/Jar_ScriptFramework.mk                                     | 2 ++
 scripting/Jar_ScriptProviderForBeanShell.mk                          | 4 ++--
 scripting/Jar_ScriptProviderForJava.mk                               | 5 +++++
 scripting/Jar_ScriptProviderForJavaScript.mk                         | 2 +-
 scripting/java/Framework/MANIFEST.MF                                 | 2 ++
 .../java/com/sun/star/script/framework/provider/java/MANIFEST.MF     | 2 ++
 6 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 scripting/java/Framework/MANIFEST.MF
 create mode 100644 scripting/java/com/sun/star/script/framework/provider/java/MANIFEST.MF

diff --git a/scripting/Jar_ScriptFramework.mk b/scripting/Jar_ScriptFramework.mk
index 05774b9a89b6..1e6a4be32d49 100644
--- a/scripting/Jar_ScriptFramework.mk
+++ b/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,\
diff --git a/scripting/Jar_ScriptProviderForBeanShell.mk b/scripting/Jar_ScriptProviderForBeanShell.mk
index 753ea101546a..aee4ad5d5a60 100644
--- a/scripting/Jar_ScriptProviderForBeanShell.mk
+++ b/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))
diff --git a/scripting/Jar_ScriptProviderForJava.mk b/scripting/Jar_ScriptProviderForJava.mk
index 39b747b113d2..19e19952c97e 100644
--- a/scripting/Jar_ScriptProviderForJava.mk
+++ b/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,\
diff --git a/scripting/Jar_ScriptProviderForJavaScript.mk b/scripting/Jar_ScriptProviderForJavaScript.mk
index 5f690858ec16..bd405cc850e0 100644
--- a/scripting/Jar_ScriptProviderForJavaScript.mk
+++ b/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))
 
diff --git a/scripting/java/Framework/MANIFEST.MF b/scripting/java/Framework/MANIFEST.MF
new file mode 100644
index 000000000000..4945b96d1a55
--- /dev/null
+++ b/scripting/java/Framework/MANIFEST.MF
@@ -0,0 +1,2 @@
+RegistrationClassName: com.sun.star.script.framework.security.SecurityDialog
+UNO-Type-Path: 
diff --git a/scripting/java/com/sun/star/script/framework/provider/java/MANIFEST.MF b/scripting/java/com/sun/star/script/framework/provider/java/MANIFEST.MF
new file mode 100644
index 000000000000..f2056d0c4214
--- /dev/null
+++ b/scripting/java/com/sun/star/script/framework/provider/java/MANIFEST.MF
@@ -0,0 +1,2 @@
+RegistrationClassName: com.sun.star.script.framework.provider.java.ScriptProviderForJava
+UNO-Type-Path: 
-- 
cgit v1.2.3