[Libreoffice-commits] .: Branch 'libreoffice-3-4' - scripting/util

[Cédric Bosdonnat]

 scripting/util/provider/beanshell/makefile.mk   |    7 +++++++
 scripting/util/provider/javascript/manifest.xml |    3 ---
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 39c7949d6cfe4ef0421e53bdca70b4b06568b9bc
Author: Noel Power <noel.power at novell.com>
Date:   Thu May 12 11:57:59 2011 +0200

    fdo#36915, fdo#36916: Fixed JS and BeanShell script providers classpath
    
    Signed-off-by: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>

diff --git a/scripting/util/provider/beanshell/makefile.mk b/scripting/util/provider/beanshell/makefile.mk
index cbb0c40..1f70fcb 100755
--- a/scripting/util/provider/beanshell/makefile.mk
+++ b/scripting/util/provider/beanshell/makefile.mk
@@ -36,6 +36,7 @@ EXTENSIONNAME:=ScriptProviderForBeanShell
 EXTENSION_ZIPNAME:=script-provider-for-beanshell
 
 COMPONENT_JARFILES=$(EXTENSIONDIR)$/$(EXTENSIONNAME).jar
+EXTENSION_PACKDEPS=$(SOLARBINDIR)$/bsh.jar
 
 .IF "$(ENABLE_SCRIPTING_BEANSHELL)" != "YES"
 @all:
@@ -46,6 +47,12 @@ COMPONENT_JARFILES=$(EXTENSIONDIR)$/$(EXTENSIONNAME).jar
 .INCLUDE : target.mk
 .INCLUDE : extension_post.mk
 
+ALLTAR : $(EXTENSIONDIR)$/bsh.jar
+
+$(EXTENSIONDIR)$/bsh.jar : $(SOLARBINDIR)$/bsh.jar
+    @@-$(MKDIRHIER) $(@:d)
+    $(COMMAND_ECHO)$(COPY) $< $@
+
 .ELSE
 
 .INCLUDE : target.mk
diff --git a/scripting/util/provider/javascript/manifest.xml b/scripting/util/provider/javascript/manifest.xml
index 4c61747..d052ad8 100755
--- a/scripting/util/provider/javascript/manifest.xml
+++ b/scripting/util/provider/javascript/manifest.xml
@@ -3,8 +3,5 @@
 <manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
   <manifest:file-entry
     manifest:media-type="application/vnd.sun.star.uno-component;type=java"
-    manifest:full-path="js.jar"/>
-  <manifest:file-entry
-    manifest:media-type="application/vnd.sun.star.uno-component;type=java"
     manifest:full-path="ScriptProviderForJavaScript.jar"/>
 </manifest:manifest>