diff --git a/description.xml b/description.xml deleted file mode 100644 index 6db9ac6..0000000 --- a/description.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - OpenOffice.org - - - - @display-name@ - - - diff --git a/libreoffice.spec b/libreoffice.spec index c21353b..603538f 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -28,7 +28,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Version: 3.2.99.2 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain Group: Applications/Productivity URL: http://www.documentfoundation.org/develop @@ -64,9 +64,7 @@ Source29: http://hg.services.openoffice.org/binaries/798b2ffdc8bcfe7bca2cf Source30: http://hg.services.openoffice.org/binaries/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip Source31: http://hg.services.openoffice.org/binaries/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip Source32: http://hg.services.openoffice.org/binaries/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz -Source33: description.xml -Source34: manifest.xml -Source35: http://download.documentfoundation.org/libreoffice/src/libreoffice-l10n-3.2.99.2.tar.bz2 +Source33: http://download.documentfoundation.org/libreoffice/src/libreoffice-l10n-3.2.99.2.tar.bz2 BuildRequires: zip, findutils, autoconf, flex, bison, icu, gperf, gcc-c++ BuildRequires: binutils, java-devel >= 1.6.0, boost-devel, zlib-devel BuildRequires: python-devel, expat-devel, libxml2-devel, libxslt-devel, bc @@ -104,6 +102,7 @@ Patch17: libreoffice-xdg632229.gnomeshell.patch Patch18: 0001-strcpy-cannot-be-used-with-overlapping-src-and-dest.patch Patch19: 0001-abort-doesn-t-gain-us-anything-here.patch Patch20: 0001-latest-libX11-changed-header-guards.patch +Patch21: turn-script-providers-into-extensions.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -686,7 +685,7 @@ Rules for auto-correcting common %{langname} typing errors. \ %endif %prep -%setup -q -c -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 35 +%setup -q -c -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 33 for a in */*; do mv `pwd`/$a .; done #remove "debugging" translations rm -rf l10n/source/kid @@ -721,6 +720,10 @@ cp -p %{SOURCE20} external/unowinreg/unowinreg.dll %patch18 -p1 -b .strcpy-cannot-be-used-with-overlapping-src-and-dest %patch19 -p1 -b .abort-doesn-t-gain-us-anything-here.patch %patch20 -p1 -b .latest-libX11-changed-header-guards.patch +%patch21 -p1 -b .turn-script-providers-into-extensions.patch +touch scripting/source/pyprov/delzip +touch scripting/util/provider/beanshell/delzip +touch scripting/util/provider/javascript/delzip %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -791,6 +794,15 @@ cd unxlng*/misc/libreoffice echo build end time is `date`, diskspace: `df -h . | tail -n 1` + +%define install_bundled_extension(n:) \ +%define extname %{-n:%{-n*}}%{!-n:%{error:No extension name given}} \ +%define extdir $RPM_BUILD_ROOT/%{baseinstdir}/share/extensions \ +%define solverbindir $SOLARVER/$INPATH/bin \ +mkdir %{extdir}/%{extname} \ +unzip -d %{extdir}/%{extname} %{solverbindir}/%{extname}.oxt + + %install rm -rf $RPM_BUILD_ROOT source ./Linux*Env.Set.sh @@ -838,52 +850,10 @@ dmake sdkoo mv ../unxlng*.pro/LibreOffice_SDK/installed/install/en-US/*/sdk $RPM_BUILD_ROOT/%{sdkinstdir} cd ../../ -# revoke ScriptProviders and make into extensions -pushd $RPM_BUILD_ROOT/%{basisinstdir}/program - -# BeanShell -../ure-link/bin/regcomp -revoke -r services.rdb -br services.rdb -c "vnd.sun.star.expand:\$OOO_BASE_DIR/program/classes/ScriptProviderForBeanShell.jar" -mkdir $RPM_BUILD_ROOT%{baseinstdir}/share/extensions/ScriptProviderForBeanShell.oxt \ - $RPM_BUILD_ROOT%{baseinstdir}/share/extensions/ScriptProviderForBeanShell.oxt/META-INF -mv classes/ScriptProviderForBeanShell.jar $RPM_BUILD_ROOT%{baseinstdir}/share/extensions/ScriptProviderForBeanShell.oxt -cp %{SOURCE33} $RPM_BUILD_ROOT%{baseinstdir}/share/extensions/ScriptProviderForBeanShell.oxt -cp %{SOURCE34} $RPM_BUILD_ROOT%{baseinstdir}/share/extensions/ScriptProviderForBeanShell.oxt/META-INF -sed -i -e 's/@display-name@/Script provider for BeanShell/' \ - -e 's/@version@/%{version}/' \ - -e 's/@id@/com.sun.star.script.provider.ScriptProviderForBeanShell/' \ - $RPM_BUILD_ROOT%{baseinstdir}/share/extensions/ScriptProviderForBeanShell.oxt/description.xml -sed -i -e 's/@type@/java/' -e 's/@path@/ScriptProviderForBeanShell.jar/' \ - $RPM_BUILD_ROOT%{baseinstdir}/share/extensions/ScriptProviderForBeanShell.oxt/META-INF/manifest.xml - -# JavaScript -../ure-link/bin/regcomp -revoke -r services.rdb -br services.rdb -c "vnd.sun.star.expand:\$OOO_BASE_DIR/program/classes/ScriptProviderForJavaScript.jar" -mkdir $RPM_BUILD_ROOT%{baseinstdir}/share/extensions/ScriptProviderForJavaScript.oxt \ - $RPM_BUILD_ROOT%{baseinstdir}/share/extensions/ScriptProviderForJavaScript.oxt/META-INF -mv classes/ScriptProviderForJavaScript.jar $RPM_BUILD_ROOT%{baseinstdir}/share/extensions/ScriptProviderForJavaScript.oxt -cp %{SOURCE33} $RPM_BUILD_ROOT%{baseinstdir}/share/extensions/ScriptProviderForJavaScript.oxt -cp %{SOURCE34} $RPM_BUILD_ROOT%{baseinstdir}/share/extensions/ScriptProviderForJavaScript.oxt/META-INF -sed -i -e 's/@display-name@/Script provider for JavaScript/' \ - -e 's/@version@/%{version}/' \ - -e 's/@id@/com.sun.star.script.provider.ScriptProviderForJavaScript/' \ - $RPM_BUILD_ROOT%{baseinstdir}/share/extensions/ScriptProviderForJavaScript.oxt/description.xml -sed -i -e 's/@type@/java/' -e 's/@path@/ScriptProviderForJavaScript.jar/' \ - $RPM_BUILD_ROOT%{baseinstdir}/share/extensions/ScriptProviderForJavaScript.oxt/META-INF/manifest.xml - -# Python -../ure-link/bin/regcomp -revoke -r services.rdb -br services.rdb -c vnd.openoffice.pymodule:pythonscript -mkdir $RPM_BUILD_ROOT%{baseinstdir}/share/extensions/ScriptProviderForPython.oxt \ - $RPM_BUILD_ROOT%{baseinstdir}/share/extensions/ScriptProviderForPython.oxt/META-INF -mv pythonscript.py $RPM_BUILD_ROOT%{baseinstdir}/share/extensions/ScriptProviderForPython.oxt -cp %{SOURCE33} $RPM_BUILD_ROOT%{baseinstdir}/share/extensions/ScriptProviderForPython.oxt -cp %{SOURCE34} $RPM_BUILD_ROOT%{baseinstdir}/share/extensions/ScriptProviderForPython.oxt/META-INF -sed -i -e 's/@display-name@/Script provider for Python/' \ - -e 's/@version@/%{version}/' \ - -e 's/@id@/com.sun.star.script.provider.ScriptProviderForPython/' \ - $RPM_BUILD_ROOT%{baseinstdir}/share/extensions/ScriptProviderForPython.oxt/description.xml -sed -i -e 's/@type@/python/' -e 's/@path@/pythonscript.py/' \ - $RPM_BUILD_ROOT%{baseinstdir}/share/extensions/ScriptProviderForPython.oxt/META-INF/manifest.xml - -popd +# install script providers +%install_bundled_extension -n script-provider-for-beanshell +%install_bundled_extension -n script-provider-for-javascript +%install_bundled_extension -n script-provider-for-python #configure sdk pushd $RPM_BUILD_ROOT/%{sdkinstdir} @@ -1776,13 +1746,12 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %files bsh %defattr(-,root,root,-) %{basisinstdir}/share/Scripts/beanshell -%{baseinstdir}/share/extensions/ScriptProviderForBeanShell.oxt +%{baseinstdir}/share/extensions/script-provider-for-beanshell %files rhino %defattr(-,root,root,-) -%{basisinstdir}/program/classes/js.jar %{basisinstdir}/share/Scripts/javascript -%{baseinstdir}/share/extensions/ScriptProviderForJavaScript.oxt +%{baseinstdir}/share/extensions/script-provider-for-javascript %files wiki-publisher %defattr(-,root,root,-) @@ -2050,11 +2019,14 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %{basisinstdir}/share/Scripts/python %{python_sitearch}/uno.py* %{python_sitearch}/unohelper.py* -%{baseinstdir}/share/extensions/ScriptProviderForPython.oxt +%{baseinstdir}/share/extensions/script-provider-for-python %{basisinstdir}/share/registry/pyuno.xcd %changelog +* Sat Nov 06 2010 David Tardon 3.2.99.2-5 - Resolves: rhbz#649210 add Sinhalese langpack diff --git a/manifest.xml b/manifest.xml deleted file mode 100644 index 280b1a5..0000000 --- a/manifest.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - diff --git a/turn-script-providers-into-extensions.patch b/turn-script-providers-into-extensions.patch new file mode 100644 index 0000000..a698a7d --- /dev/null +++ b/turn-script-providers-into-extensions.patch @@ -0,0 +1,393 @@ +diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp +index d052261..0eb090c 100644 +--- a/scp2/source/ooo/file_ooo.scp ++++ b/scp2/source/ooo/file_ooo.scp +@@ -453,10 +453,6 @@ UNO_JAR_FILE( gid_File_Jar_Lucenehelpwrapper, LuceneHelpWrapper ) + #endif + + #ifdef SOLAR_JAVA +-STD_JAR_FILE( gid_File_Jar_Js, js ) +-#endif +- +-#ifdef SOLAR_JAVA + + #ifndef MACOSX + +@@ -501,9 +497,7 @@ End + + #ifdef SOLAR_JAVA + UNO_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework ) +-UNO_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell ) + UNO_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava ) +-UNO_JAR_FILE( gid_File_Jar_Scriptproviderforjavascript, ScriptProviderForJavaScript ) + #endif + + #ifdef SOLAR_JAVA +diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp +index 5ffe87a..4a4b2ff 100644 +--- a/scp2/source/ooo/module_hidden_ooo.scp ++++ b/scp2/source/ooo/module_hidden_ooo.scp +@@ -91,7 +91,6 @@ Module gid_Module_Root_Files_3 + gid_File_Jar_Hsqldb, + gid_File_Jar_Hsqldb_Sdbc, + gid_File_Jar_Accessbridge, +- gid_File_Jar_Js, + gid_File_Jar_Officebean, + gid_File_Jar_Report, + gid_File_Jar_Table, +@@ -104,9 +103,7 @@ Module gid_Module_Root_Files_3 + gid_File_Jar_Commonwizards, + gid_File_Jar_Sandbox, + gid_File_Jar_Scriptframework, +- gid_File_Jar_Scriptproviderforbeanshell, + gid_File_Jar_Scriptproviderforjava, +- gid_File_Jar_Scriptproviderforjavascript, + gid_File_Jar_Xml_Apis, + gid_File_Jar_Bsh, + gid_File_Jar_Classes, +diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp +index e586876..0876b53 100644 +--- a/scp2/source/python/file_python.scp ++++ b/scp2/source/python/file_python.scp +@@ -104,16 +104,6 @@ End + #endif + #endif + +-// Scripting Framework Python script proxy +- +-File gid_File_Py_Pythonscript +- TXT_FILE_BODY; +- Dir = gid_Dir_Program; +- Name = "pythonscript.py"; +- RegistryID = gid_Starregistry_Services_Rdb; +- Styles = (PACKED,UNO_COMPONENT); +-End +- + //Scripting Framework Python example scripts + + File gid_File_Scripts_Python +diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp +index 3abeec2..d32f6f6 100644 +--- a/scp2/source/python/module_python.scp ++++ b/scp2/source/python/module_python.scp +@@ -32,7 +32,7 @@ Module gid_Module_Optional_Pyuno + MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON ); + ParentID = gid_Module_Optional; + Sortkey = "750"; +- Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So, gid_File_Lib_Python_So_Brand, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd); ++ Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So, gid_File_Lib_Python_So_Brand,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd); + Minimal = NO; + Default = YES; + Styles = ( ); +diff --git a/scripting/prj/build.lst b/scripting/prj/build.lst +index 7d51621..81a8512 100755 +--- a/scripting/prj/build.lst ++++ b/scripting/prj/build.lst +@@ -12,3 +12,5 @@ tc scripting\java nmake - all tc1_scriptingjava tc1_scriptingprovider tc1_s + tc scripting\examples\java nmake - all tc1_scriptingexamplesjava tc1_scriptingjava NULL + tc scripting\examples nmake - all tc1_scriptingexamples tc1_scriptingexamplesjava tc1_inc NULL + tc scripting\util nmake - all tc1_scriptingutil tc1_scriptingprovider tc1_scriptingprotocolhandler tc1_scriptingbasprov tc1_scriptingstringresource tc1_scriptingvbaevents tc1_scriptingpyprov tc1_scriptingjava tc1_scriptingexamplesjava tc1_scriptingexamples NULL ++tc scripting\util\provider\javascript nmake - all tc1_scriptingjsprov tc1_scriptingjava NULL ++tc scripting\util\provider\beanshell nmake - all tc1_scriptingbshprov tc1_scriptingjava NULL +diff --git a/scripting/prj/d.lst b/scripting/prj/d.lst +index ef216fe..30d5e1c 100644 +--- a/scripting/prj/d.lst ++++ b/scripting/prj/d.lst +@@ -15,3 +15,6 @@ mkdir: %_DEST%\bin%_EXT%\pyuno + ..\source\storage\storage.xml %_DEST%\xml%_EXT%\storage.xml + + ..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib ++ ++# Extensions ++..\%__SRC%\bin\*.oxt %_DEST%\bin%_EXT%\*.oxt +diff --git a/scripting/source/pyprov/description.xml b/scripting/source/pyprov/description.xml +new file mode 100644 +index 0000000..1fe0a3d +--- /dev/null ++++ b/scripting/source/pyprov/description.xml +@@ -0,0 +1,24 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ The ++ Document Foundation ++ ++ ++ ++ Script provider for Python ++ ++ ++ +diff --git a/scripting/source/pyprov/makefile.mk b/scripting/source/pyprov/makefile.mk +index 3c02785..2a63d9f 100644 +--- a/scripting/source/pyprov/makefile.mk ++++ b/scripting/source/pyprov/makefile.mk +@@ -39,11 +39,26 @@ TARGET=pyprov + + # --- Targets ------------------------------------------------------ + ALL : ALLTAR \ +- $(DLLDEST)$/pythonscript.py \ + $(DLLDEST)$/officehelper.py \ + $(DLLDEST)$/mailmerge.py + + $(DLLDEST)$/%.py: %.py + cp $? $@ + +-.INCLUDE : target.mk ++# scripting provider extension ++.IF "$(L10N_framework)"=="" ++ ++EXTENSIONNAME:=ScriptProviderForPython ++EXTENSION_ZIPNAME:=script-provider-for-python ++ ++COMPONENT_FILES=$(EXTENSIONDIR)$/pythonscript.py ++ ++.INCLUDE : extension_pre.mk ++.INCLUDE : target.mk ++.INCLUDE : extension_post.mk ++ ++.ELSE ++ ++.INCLUDE : target.mk ++ ++.ENDIF +diff --git a/scripting/source/pyprov/manifest.xml b/scripting/source/pyprov/manifest.xml +new file mode 100644 +index 0000000..7e4e045 +--- /dev/null ++++ b/scripting/source/pyprov/manifest.xml +@@ -0,0 +1,7 @@ ++ ++ ++ ++ ++ +diff --git a/scripting/util/provider/beanshell/description.xml b/scripting/util/provider/beanshell/description.xml +new file mode 100644 +index 0000000..6b05318 +--- /dev/null ++++ b/scripting/util/provider/beanshell/description.xml +@@ -0,0 +1,24 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ The ++ Document Foundation ++ ++ ++ ++ Script provider for BeanShell ++ ++ ++ +diff --git a/scripting/util/provider/beanshell/makefile.mk b/scripting/util/provider/beanshell/makefile.mk +new file mode 100644 +index 0000000..7e16329 +--- /dev/null ++++ b/scripting/util/provider/beanshell/makefile.mk +@@ -0,0 +1,48 @@ ++# Version: MPL 1.1 / GPLv3+ / LGPLv3+ ++# ++# The contents of this file are subject to the Mozilla Public License Version ++# 1.1 (the "License"); you may not use this file except in compliance with ++# the License. You may obtain a copy of the License at ++# http://www.mozilla.org/MPL/ ++# ++# Software distributed under the License is distributed on an "AS IS" basis, ++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++# for the specific language governing rights and limitations under the ++# License. ++# ++# The Initial Developer of the Original Code is ++# Red Hat, Inc. ++# Portions created by the Initial Developer are Copyright (C) 2010 the ++# Initial Developer. All Rights Reserved. ++# ++# Contributor(s): David Tardon ++# ++# Alternatively, the contents of this file may be used under the terms of ++# either the GNU General Public License Version 3 or later (the "GPLv3+"), or ++# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), ++# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable ++# instead of those above. ++ ++PRJ=..$/..$/.. ++ ++PRJNAME=scripting ++TARGET=bshprov ++ ++.INCLUDE : settings.mk ++ ++.IF "$(L10N_framework)"=="" && "$(SOLAR_JAVA)"!="" ++ ++EXTENSIONNAME:=ScriptProviderForBeanShell ++EXTENSION_ZIPNAME:=script-provider-for-beanshell ++ ++COMPONENT_JARFILES=$(EXTENSIONDIR)$/$(EXTENSIONNAME).jar ++ ++.INCLUDE : extension_pre.mk ++.INCLUDE : target.mk ++.INCLUDE : extension_post.mk ++ ++.ELSE ++ ++.INCLUDE : target.mk ++ ++.ENDIF +diff --git a/scripting/util/provider/beanshell/manifest.xml b/scripting/util/provider/beanshell/manifest.xml +new file mode 100644 +index 0000000..da8e620 +--- /dev/null ++++ b/scripting/util/provider/beanshell/manifest.xml +@@ -0,0 +1,7 @@ ++ ++ ++ ++ ++ +diff --git a/scripting/util/provider/javascript/description.xml b/scripting/util/provider/javascript/description.xml +new file mode 100644 +index 0000000..58f0478 +--- /dev/null ++++ b/scripting/util/provider/javascript/description.xml +@@ -0,0 +1,24 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ The ++ Document Foundation ++ ++ ++ ++ Script provider for JavaScript ++ ++ ++ +diff --git a/scripting/util/provider/javascript/makefile.mk b/scripting/util/provider/javascript/makefile.mk +new file mode 100644 +index 0000000..a99096a +--- /dev/null ++++ b/scripting/util/provider/javascript/makefile.mk +@@ -0,0 +1,55 @@ ++# Version: MPL 1.1 / GPLv3+ / LGPLv3+ ++# ++# The contents of this file are subject to the Mozilla Public License Version ++# 1.1 (the "License"); you may not use this file except in compliance with ++# the License. You may obtain a copy of the License at ++# http://www.mozilla.org/MPL/ ++# ++# Software distributed under the License is distributed on an "AS IS" basis, ++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++# for the specific language governing rights and limitations under the ++# License. ++# ++# The Initial Developer of the Original Code is ++# Red Hat, Inc. ++# Portions created by the Initial Developer are Copyright (C) 2010 the ++# Initial Developer. All Rights Reserved. ++# ++# Contributor(s): David Tardon ++# ++# Alternatively, the contents of this file may be used under the terms of ++# either the GNU General Public License Version 3 or later (the "GPLv3+"), or ++# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), ++# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable ++# instead of those above. ++ ++PRJ=..$/..$/.. ++ ++PRJNAME=scripting ++TARGET=jsprov ++ ++.INCLUDE : settings.mk ++ ++.IF "$(L10N_framework)"=="" && "$(SOLAR_JAVA)"!="" ++ ++EXTENSIONNAME:=ScriptProviderForJavaScript ++EXTENSION_ZIPNAME:=script-provider-for-javascript ++ ++COMPONENT_JARFILES=$(EXTENSIONDIR)$/$(EXTENSIONNAME).jar ++EXTENSION_PACKDEPS=$(SOLARBINDIR)$/js.jar ++ ++.INCLUDE : extension_pre.mk ++.INCLUDE : target.mk ++.INCLUDE : extension_post.mk ++ ++ALLTAR : $(EXTENSIONDIR)$/js.jar ++ ++$(EXTENSIONDIR)$/js.jar : $(SOLARBINDIR)$/js.jar ++ @@-$(MKDIRHIER) $(@:d) ++ $(COMMAND_ECHO)$(COPY) $< $@ ++ ++.ELSE ++ ++.INCLUDE : target.mk ++ ++.ENDIF +diff --git a/scripting/util/provider/javascript/manifest.xml b/scripting/util/provider/javascript/manifest.xml +new file mode 100644 +index 0000000..4c61747 +--- /dev/null ++++ b/scripting/util/provider/javascript/manifest.xml +@@ -0,0 +1,10 @@ ++ ++ ++ ++ ++ ++ +diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk +--- a/instsetoo_native/util/makefile.mk ++++ b/instsetoo_native/util/makefile.mk +@@ -72,7 +72,6 @@ LOCALPYFILES= \ + $(BIN)$/uno.py \ + $(BIN)$/unohelper.py \ + $(BIN)$/pythonloader.py \ +- $(BIN)$/pythonscript.py \ + $(BIN)$/officehelper.py \ + $(BIN)$/mailmerge.py +