diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:50 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:50 +0200 |
| commit | ca39c0ee5fb571693f96fe32f55b814d74e5b756 (patch) | |
| tree | 61059dca291da35c9eac7e275d0866598eeff2ee /scripting | |
| parent | 9e1f58bf469984c19cd60031074eb60da56453a2 (diff) | |
| parent | d974d2ada8a61acf48fb0a9e3e4fa4744016dcda (diff) | |
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
basic/source/app/app.cxx
basic/source/runtime/iosys.cxx
desktop/unx/source/start.c
sfx2/source/appl/appdata.cxx
sfx2/source/appl/appinit.cxx
sfx2/source/inc/appdata.hxx
svx/AllLangResTarget_svx.mk
sysui/desktop/productversion.mk
sysui/desktop/share/makefile.mk
Diffstat (limited to 'scripting')
| -rwxr-xr-x | scripting/util/provider/beanshell/makefile.mk | 13 | ||||
| -rwxr-xr-x | scripting/util/provider/javascript/manifest.xml | 3 |
2 files changed, 13 insertions, 3 deletions
diff --git a/scripting/util/provider/beanshell/makefile.mk b/scripting/util/provider/beanshell/makefile.mk index cbb0c40e6215..a7c74f51803c 100755 --- a/scripting/util/provider/beanshell/makefile.mk +++ b/scripting/util/provider/beanshell/makefile.mk @@ -36,6 +36,9 @@ EXTENSIONNAME:=ScriptProviderForBeanShell EXTENSION_ZIPNAME:=script-provider-for-beanshell COMPONENT_JARFILES=$(EXTENSIONDIR)$/$(EXTENSIONNAME).jar +.IF "$(SYSTEM_BSH)" != "YES" +EXTENSION_PACKDEPS=$(SOLARBINDIR)$/bsh.jar +.ENDIF .IF "$(ENABLE_SCRIPTING_BEANSHELL)" != "YES" @all: @@ -46,6 +49,16 @@ COMPONENT_JARFILES=$(EXTENSIONDIR)$/$(EXTENSIONNAME).jar .INCLUDE : target.mk .INCLUDE : extension_post.mk +.IF "$(SYSTEM_BSH)" != "YES" + +ALLTAR : $(EXTENSIONDIR)$/bsh.jar + +$(EXTENSIONDIR)$/bsh.jar : $(SOLARBINDIR)$/bsh.jar + @@-$(MKDIRHIER) $(@:d) + $(COMMAND_ECHO)$(COPY) $< $@ + +.ENDIF + .ELSE .INCLUDE : target.mk diff --git a/scripting/util/provider/javascript/manifest.xml b/scripting/util/provider/javascript/manifest.xml index 4c61747f4dcf..d052ad8bc3ea 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> |