please see updated patch Noel
diff --git scripting/util/provider/beanshell/makefile.mk scripting/util/provider/beanshell/makefile.mk index cbb0c40..1f70fcb 100755 --- scripting/util/provider/beanshell/makefile.mk +++ 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 scripting/util/provider/javascript/manifest.xml scripting/util/provider/javascript/manifest.xml index 4c61747..d052ad8 100755 --- scripting/util/provider/javascript/manifest.xml +++ 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>
_______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
