diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-03 14:11:00 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-03 14:18:59 +0100 |
| commit | a72a7dc500ffd57662e8b9be61e4676266861c33 (patch) | |
| tree | 6cc21e11fbaec37563ad42d5749f103c0a635146 /postprocess | |
| parent | 7a17b2b9d0e9bc0a95ba8bee72c2b24fb529005b (diff) | |
fdo#42312: Change bsh and js script providers from extensions to optional modules.
Their jar files reference other non-URE jars, so they cannot be extensions.
bsh.jar has been moved into the optional module (it used to be installed
always, but it looks like only the bsh script provider needs it; also, it
had been added to URE_MORE_JAVA_CLASSPATH_URLS if SYSTEM_BSH, which also
appears unnecessary as it is mentioned with an absolute file URL in the
Class-Path of the script provider jar).
js.jar has been included in the optional module (it used to be not installed
at all?).
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 31 | ||||
| -rw-r--r-- | postprocess/prj/d.lst | 2 |
2 files changed, 32 insertions, 1 deletions
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index b983928ab99f..e40327e9d846 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -368,7 +368,10 @@ my_components += component/avmedia/source/gstreamer/avmediagstreamer .INCLUDE: target.mk -ALLTAR : $(MISC)/services.rdb +ALLTAR : \ + $(MISC)/services.rdb \ + $(MISC)/scriptproviderforbeanshell.rdb \ + $(MISC)/scriptproviderforjavascript.rdb $(MISC)/services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \ $(MISC)/services.input $(my_components:^"$(SOLARXMLDIR)/":+".component") @@ -379,3 +382,29 @@ $(MISC)/services.input : makefile.mk echo \ '<list>$(my_components:^"<filename>":+".component</filename>")</list>' \ > $@ + +$(MISC)/scriptproviderforbeanshell.rdb .ERRREMOVE : \ + $(SOLARENV)/bin/packcomponents.xslt \ + $(MISC)/scriptproviderforbeanshell.input \ + $(SOLARXMLDIR)/component/scripting/java/ScriptProviderForBeanShell.component + $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \ + $(SOLARENV)/bin/packcomponents.xslt \ + $(MISC)/scriptproviderforbeanshell.input + +$(MISC)/scriptproviderforbeanshell.input : makefile.mk + echo \ + '<list><filename>component/scripting/java/ScriptProviderForBeanShell.component</filename></list>' \ + > $@ + +$(MISC)/scriptproviderforjavascript.rdb .ERRREMOVE : \ + $(SOLARENV)/bin/packcomponents.xslt \ + $(MISC)/scriptproviderforjavascript.input \ + $(SOLARXMLDIR)/component/scripting/java/ScriptProviderForJavaScript.component + $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \ + $(SOLARENV)/bin/packcomponents.xslt \ + $(MISC)/scriptproviderforjavascript.input + +$(MISC)/scriptproviderforjavascript.input : makefile.mk + echo \ + '<list><filename>component/scripting/java/ScriptProviderForJavaScript.component</filename></list>' \ + > $@ diff --git a/postprocess/prj/d.lst b/postprocess/prj/d.lst index 171e9db91e33..f6be8cf864ab 100644 --- a/postprocess/prj/d.lst +++ b/postprocess/prj/d.lst @@ -2,4 +2,6 @@ mkdir: %_DEST%\xml\ooo ..\%__SRC%\bin\uiconfig.zip %_DEST%\bin\uiconfig.zip ..\%__SRC%\misc\*.xcd %_DEST%\xml\ ..\%__SRC%\misc\lang\*.xcd %_DEST%\xml\ +..\%__SRC%\misc\scriptproviderforbeanshell.rdb %_DEST%\xml\scriptproviderforbeanshell.rdb +..\%__SRC%\misc\scriptproviderforjavascript.rdb %_DEST%\xml\scriptproviderforjavascript.rdb ..\%__SRC%\misc\services.rdb %_DEST%\xml\services.rdb |