diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-11-30 10:23:23 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-30 10:28:25 +0100 |
commit | 1f3496e204cd305264d27a362f34fdcb6fa5f693 (patch) | |
tree | d2f7b1fd68980d32e8580e2fa1af163c39ab4f18 /scripting | |
parent | f532752756c81a295116b0889fe4e9d31b7c3bb6 had rolled back helpcontent2 (diff) | |
download | core-1f3496e204cd305264d27a362f34fdcb6fa5f693.tar.gz core-1f3496e204cd305264d27a362f34fdcb6fa5f693.zip |
Turn Python Scripting Provider from bundled extension to plain code
To avoid unnecessary confusion between the newly plain code and any instance of
the old extension still installed (per-user or shared), I renamed the UNO
implementation identifier org.openoffice.pyuno.LanguageScriptProviderForPython
to org.libreoffice.pyuno.LanguageScriptProviderForPython. Also, existing
installations of the extension are explicitly not migrated to new user profiles.
Change-Id: Id3dd66ba5e52e0962f7ad0ccb5e4ad5b0bec97fa
Diffstat (limited to 'scripting')
-rw-r--r-- | scripting/Extension_ScriptProviderForPython.mk | 36 | ||||
-rw-r--r-- | scripting/Module_scripting.mk | 3 | ||||
-rw-r--r-- | scripting/Package_scriptproviderforpython.mk | 15 | ||||
-rw-r--r-- | scripting/source/pyprov/META-INF/manifest.xml | 24 | ||||
-rw-r--r-- | scripting/source/pyprov/description-en-US.txt | 1 | ||||
-rw-r--r-- | scripting/source/pyprov/description.xml | 44 | ||||
-rwxr-xr-x | scripting/source/pyprov/pythonscript.py | 2 | ||||
-rw-r--r-- | scripting/source/pyprov/scriptproviderforpython.rdb (renamed from scripting/source/pyprov/components.rdb) | 14 |
8 files changed, 26 insertions, 113 deletions
diff --git a/scripting/Extension_ScriptProviderForPython.mk b/scripting/Extension_ScriptProviderForPython.mk deleted file mode 100644 index 4c4b043671ab..000000000000 --- a/scripting/Extension_ScriptProviderForPython.mk +++ /dev/null @@ -1,36 +0,0 @@ -# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- -# 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 or as specified alternatively below. 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 -# Matúš Kukan <matus.kukan@gmail.com> -# Portions created by the Initial Developer are Copyright (C) 2011 the -# Initial Developer. All Rights Reserved. -# -# Major Contributor(s): -# -# For minor contributions see the git repository. -# -# 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. - -$(eval $(call gb_Extension_Extension,script-provider-for-python,scripting/source/pyprov)) - -$(eval $(call gb_Extension_add_file,script-provider-for-python,pythonscript.py,\ - $(SRCDIR)/scripting/source/pyprov/pythonscript.py)) -$(eval $(call gb_Extension_add_file,script-provider-for-python,components.rdb,\ - $(SRCDIR)/scripting/source/pyprov/components.rdb)) - -# vim: set noet sw=4 ts=4: diff --git a/scripting/Module_scripting.mk b/scripting/Module_scripting.mk index bf385cd78c46..3243ba9a73db 100644 --- a/scripting/Module_scripting.mk +++ b/scripting/Module_scripting.mk @@ -48,7 +48,8 @@ $(eval $(call gb_Module_add_targets,scripting,\ Zip_ScriptsJava \ ) \ $(if $(filter $(ENABLE_SCRIPTING_PYTHON),YES),\ - Extension_ScriptProviderForPython) \ + Package_scriptproviderforpython \ + ) \ Library_basprov \ Library_dlgprov \ Library_protocolhandler \ diff --git a/scripting/Package_scriptproviderforpython.mk b/scripting/Package_scriptproviderforpython.mk new file mode 100644 index 000000000000..641c3cbc3910 --- /dev/null +++ b/scripting/Package_scriptproviderforpython.mk @@ -0,0 +1,15 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Package_Package,scriptproviderforpython,$(SRCDIR)/scripting/source/pyprov)) + +$(eval $(call gb_Package_add_file,scriptproviderforpython,xml/scriptproviderforpython.rdb,scriptproviderforpython.rdb)) +$(eval $(call gb_Package_add_file,scriptproviderforpython,bin/pythonscript.py,pythonscript.py)) + +# vim: set noet sw=4 ts=4: diff --git a/scripting/source/pyprov/META-INF/manifest.xml b/scripting/source/pyprov/META-INF/manifest.xml deleted file mode 100644 index 7a8f084277a6..000000000000 --- a/scripting/source/pyprov/META-INF/manifest.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd"> -<!-- - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 . ---> -<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest"> - <manifest:file-entry - manifest:media-type="application/vnd.sun.star.uno-components" - manifest:full-path="components.rdb"/> -</manifest:manifest> diff --git a/scripting/source/pyprov/description-en-US.txt b/scripting/source/pyprov/description-en-US.txt deleted file mode 100644 index 7e60ea0aba5f..000000000000 --- a/scripting/source/pyprov/description-en-US.txt +++ /dev/null @@ -1 +0,0 @@ -Add support for Python via the Scripting Framework to enable Python scripts in the user and share directories of a LibreOffice installation, and also in loaded documents. diff --git a/scripting/source/pyprov/description.xml b/scripting/source/pyprov/description.xml deleted file mode 100644 index d3b5cb64f6dd..000000000000 --- a/scripting/source/pyprov/description.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0"?> -<!-- - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 . ---> -<description - xmlns="http://openoffice.org/extensions/description/2006" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:dep="http://openoffice.org/extensions/description/2006"> - - <identifier value="com.sun.star.script.provider.ScriptProviderForPython"/> - - <dependencies> - <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/> - </dependencies> - - <version value="3.3.1"/> - - <publisher> - <name xlink:href="http://www.documentfoundation.org" lang="en-US">The Document Foundation</name> - </publisher> - - <display-name> - <name lang="en-US">Script provider for Python</name> - </display-name> - - <extension-description> - <src xlink:href="description-en-US.txt" lang="en-US"/> - </extension-description> - -</description> diff --git a/scripting/source/pyprov/pythonscript.py b/scripting/source/pyprov/pythonscript.py index 78c622640fef..dcf05d4f9b7c 100755 --- a/scripting/source/pyprov/pythonscript.py +++ b/scripting/source/pyprov/pythonscript.py @@ -137,7 +137,7 @@ CALLABLE_CONTAINER_NAME = "g_exportedScripts" # pythonloader looks for a static g_ImplementationHelper variable g_ImplementationHelper = unohelper.ImplementationHelper() -g_implName = "org.openoffice.pyuno.LanguageScriptProviderFor"+LANGUAGENAME +g_implName = "org.libreoffice.pyuno.LanguageScriptProviderFor"+LANGUAGENAME diff --git a/scripting/source/pyprov/components.rdb b/scripting/source/pyprov/scriptproviderforpython.rdb index 2436cab14260..09a37e4da108 100644 --- a/scripting/source/pyprov/components.rdb +++ b/scripting/source/pyprov/scriptproviderforpython.rdb @@ -17,10 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <components xmlns="http://openoffice.org/2010/uno-components"> - <component loader="com.sun.star.loader.Python" uri="./pythonscript.py"> - <implementation name="org.openoffice.pyuno.LanguageScriptProviderForPython"> - <service name="com.sun.star.script.provider.ScriptProviderForPython"/> - <service name="com.sun.star.script.provider.LanguageScriptProvider"/> - </implementation> - </component> + <component loader="com.sun.star.loader.Python" + uri="vnd.openoffice.pymodule:pythonscript"> + <implementation + name="org.libreoffice.pyuno.LanguageScriptProviderForPython"> + <service name="com.sun.star.script.provider.ScriptProviderForPython"/> + <service name="com.sun.star.script.provider.LanguageScriptProvider"/> + </implementation> + </component> </components> |