diff options
| author | Noel Power <noel.power@novell.com> | 2011-05-12 11:57:59 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2011-05-12 11:59:33 +0200 |
| commit | 39c7949d6cfe4ef0421e53bdca70b4b06568b9bc (patch) | |
| tree | 46a26bc2f132f7dcb492deba83d9fa5d327b7430 | |
| parent | 347c67da659f3e387ff215fe3914760c4e0b3988 (diff) | |
fdo#36915, fdo#36916: Fixed JS and BeanShell script providers classpath
Signed-off-by: Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr>
| -rwxr-xr-x | scripting/util/provider/beanshell/makefile.mk | 7 | ||||
| -rwxr-xr-x | scripting/util/provider/javascript/manifest.xml | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/scripting/util/provider/beanshell/makefile.mk b/scripting/util/provider/beanshell/makefile.mk index cbb0c40e62..1f70fcbf5b 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 4c61747f4d..d052ad8bc3 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> |