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 /scp2 | |
| 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 'scp2')
| -rw-r--r-- | scp2/source/extensions/directory_extensions.scp | 11 | ||||
| -rw-r--r-- | scp2/source/extensions/file_extensions.scp | 17 | ||||
| -rw-r--r-- | scp2/source/extensions/module_extensions.scp | 5 |
3 files changed, 15 insertions, 18 deletions
diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp index 9d3a018647fe..eb3a08e3e5da 100644 --- a/scp2/source/extensions/directory_extensions.scp +++ b/scp2/source/extensions/directory_extensions.scp @@ -226,15 +226,4 @@ End #endif -/* ** Script provider for Python ** */ - -#ifndef WITHOUT_EXTENSION_SCRIPTING_PYTHON - -Directory gid_Brand_Dir_Share_Extensions_Script_Provider_For_Python - ParentID = gid_Brand_Dir_Share_Extensions; - DosName = "script-provider-for-python"; -End - -#endif - #endif diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index 24b2e77bce06..763312515939 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -297,13 +297,20 @@ End /* ** Script provider for Python ** */ -#ifndef WITHOUT_EXTENSION_SCRIPTING_PYTHON +#ifndef WITHOUT_SCRIPTING_PYTHON -File gid_File_Oxt_Script_Provider_For_Python +File gid_File_Py_Pythonscript TXT_FILE_BODY; - Styles = (PACKED, ARCHIVE); - Dir = gid_Brand_Dir_Share_Extensions_Script_Provider_For_Python; - Name = "script-provider-for-python.oxt"; + Dir = gid_Brand_Dir_Program; + Name = "pythonscript.py"; + Styles = (PACKED); +End + +File gid_File_Rdb_Scriptproviderforpython + TXT_FILE_BODY; + Dir = gid_Brand_Dir_Program_Services; + Name = "scriptproviderforpython.rdb"; + Styles = (PACKED); End #endif diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp index 37558c30e558..17c77109563a 100644 --- a/scp2/source/extensions/module_extensions.scp +++ b/scp2/source/extensions/module_extensions.scp @@ -334,14 +334,15 @@ End /* ** Script provider for Python ** */ -#ifndef WITHOUT_EXTENSION_SCRIPTING_PYTHON +#ifndef WITHOUT_SCRIPTING_PYTHON Module gid_Module_Optional_Extensions_Script_Provider_For_Python PackageInfo = "packinfo_extensions.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_PYTHON); ParentID = gid_Module_Optional_Extensions; Files = ( - gid_File_Oxt_Script_Provider_For_Python ); + gid_File_Py_Pythonscript, + gid_File_Rdb_Scriptproviderforpython ); Minimal = NO; Default = YES; Styles = ( ); |