configure.ac | 10 ------ scp2/InstallModule_python.mk | 3 - scp2/source/extensions/file_extensions.scp | 20 ------------ scp2/source/extensions/module_extensions.scp | 18 ----------- scp2/source/extensions/module_extensions.ulf | 6 --- scp2/source/ooo/file_ooo.scp | 6 +++ scp2/source/python/file_python.scp | 14 ++++++++ scp2/source/python/module_python.scp | 13 +++----- scp2/source/python/module_python.ulf | 32 -------------------- scp2/source/python/module_python_librelogo.scp | 4 +- scp2/source/python/module_python_mailmerge.scp | 39 ------------------------- scp2/source/python/module_python_mailmerge.ulf | 23 -------------- scp2/source/python/profileitem_python.scp | 6 +-- 13 files changed, 31 insertions(+), 163 deletions(-)
New commits: commit 83b4703137fdf49304e41202cc91a5574b2e53e7 Author: Andras Timar <ati...@suse.com> Date: Tue Feb 19 15:21:23 2013 +0100 fdo#49202 install the "Python-UNO Bridge" component on Windows unconditionally Change-Id: I1d9d62b024c4442182d67d93915af0f793265ebd diff --git a/configure.ac b/configure.ac index 37b18cc..25145ca 100644 --- a/configure.ac +++ b/configure.ac @@ -10254,16 +10254,6 @@ AC_SUBST(ENABLE_SCRIPTING_JAVASCRIPT) AC_SUBST(SYSTEM_RHINO) AC_SUBST(RHINO_JAR) -dnl Scripting provider for Python extension? -dnl We always provide this unless we have disabled Python completely -if test $enable_python = no; then - ENABLE_SCRIPTING_PYTHON=NO - SCPDEFS="$SCPDEFS -DWITHOUT_SCRIPTING_PYTHON" -else - ENABLE_SCRIPTING_PYTHON=YES -fi -AC_SUBST(ENABLE_SCRIPTING_PYTHON) - supports_multilib= case "$host_cpu" in x86_64 | powerpc64 | s390x) diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk index 7153dee..8b8af48 100644 --- a/scp2/InstallModule_python.mk +++ b/scp2/InstallModule_python.mk @@ -57,12 +57,11 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/python,\ scp2/source/python/file_python \ scp2/source/python/file_python_librelogo \ scp2/source/python/profileitem_python \ + scp2/source/python/module_python \ )) $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/python,\ - scp2/source/python/module_python \ scp2/source/python/module_python_librelogo \ - scp2/source/python/module_python_mailmerge \ )) # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index 84d90af..5f9b410 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -282,24 +282,4 @@ End #endif -/* ** Script provider for Python ** */ - -#ifndef WITHOUT_SCRIPTING_PYTHON - -File gid_File_Py_Pythonscript - TXT_FILE_BODY; - 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 - #endif diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp index 54612fb..84fac6b 100644 --- a/scp2/source/extensions/module_extensions.scp +++ b/scp2/source/extensions/module_extensions.scp @@ -317,22 +317,4 @@ End #endif -/* ** Script provider for 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_Py_Pythonscript, - gid_File_Rdb_Scriptproviderforpython ); - Minimal = NO; - Default = YES; - Styles = ( ); -End - -#endif - #endif diff --git a/scp2/source/extensions/module_extensions.ulf b/scp2/source/extensions/module_extensions.ulf index 27bdfc0..61618c0 100644 --- a/scp2/source/extensions/module_extensions.ulf +++ b/scp2/source/extensions/module_extensions.ulf @@ -140,9 +140,3 @@ en-US = "Script provider for JavaScript" [STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT] en-US = "Script provider for JavaScript" - -[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_PYTHON] -en-US = "Script provider for Python" - -[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_PYTHON] -en-US = "Script provider for Python" diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index f1f6048..630d32b 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -499,6 +499,12 @@ File gid_File_Wizards_Agenda ARCHIVE_TXT_FILE_BODY; Name = "agenda.zip"; End + +File gid_File_Pymailmerge + TXT_FILE_BODY; + Dir = gid_Brand_Dir_Program; + ARCHIVE_TXT_FILE_BODY; + Name = "mailmerge.zip"; #endif #endif diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index fc4db23..733371c 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -29,6 +29,20 @@ #ifndef DISABLE_PYUNO +File gid_File_Py_Pythonscript + TXT_FILE_BODY; + 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 + File gid_File_Lib_Pyuno LIB_FILE_BODY; #ifdef UNX diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp index 629a864..ec258cd 100644 --- a/scp2/source/python/module_python.scp +++ b/scp2/source/python/module_python.scp @@ -29,11 +29,8 @@ #ifndef DISABLE_PYUNO -Module gid_Module_Optional_Pyuno - PackageInfo = "packinfo_office.txt"; - MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON ); - ParentID = gid_Module_Optional; - Sortkey = "750"; +Module gid_Module_Pyuno + ParentID = gid_Module_Root_Brand; Dirs = (gid_Dir_PythonFramework, gid_Dir_PythonFramework_Versions, gid_Dir_PythonFramework_Versions_ver, @@ -54,6 +51,8 @@ Module gid_Module_Optional_Pyuno gid_File_Py_Pythonloader, gid_File_Py_Python_Core, gid_File_Py_Python_Bin, + gid_File_Py_Pythonscript, + gid_File_Rdb_Scriptproviderforpython, gid_File_Lib_Python_So, gid_File_Lib_Python3_So, gid_File_Scripts_Python, @@ -77,9 +76,7 @@ Module gid_Module_Optional_Pyuno gid_Unixlink_Python_libpython_config_dylib, gid_Unixlink_Python_libpython_m_config_a, gid_Unixlink_Python_libpython_m_config_dylib); - Minimal = NO; - Default = YES; - Styles = ( ); + Styles = (HIDDEN_ROOT); End #endif diff --git a/scp2/source/python/module_python.ulf b/scp2/source/python/module_python.ulf deleted file mode 100644 index 4271d10..0000000 --- a/scp2/source/python/module_python.ulf +++ /dev/null @@ -1,32 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -[STR_NAME_MODULE_OPTIONAL_PYTHON] -en-US = "Python-UNO Bridge" - -[STR_DESC_MODULE_OPTIONAL_PYTHON] -en-US = "Adds the ability to automate %PRODUCTNAME with the Python scripting language." diff --git a/scp2/source/python/module_python_librelogo.scp b/scp2/source/python/module_python_librelogo.scp index 63982cb..dac4a9c 100644 --- a/scp2/source/python/module_python_librelogo.scp +++ b/scp2/source/python/module_python_librelogo.scp @@ -13,8 +13,8 @@ Module gid_Module_Optional_Pyuno_LibreLogo PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON_LIBRELOGO ); - ParentID = gid_Module_Optional_Pyuno; - Sortkey = "100"; + ParentID = gid_Module_Optional; + Sortkey = "810"; Files = (gid_File_LibreLogo, gid_File_Share_Registry_LibreLogo_Xcd); Minimal = NO; diff --git a/scp2/source/python/module_python_mailmerge.scp b/scp2/source/python/module_python_mailmerge.scp deleted file mode 100644 index cf5ad7e..0000000 --- a/scp2/source/python/module_python_mailmerge.scp +++ /dev/null @@ -1,39 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.inc" - -#ifndef AIX -#ifndef DISABLE_PYUNO -File gid_File_Pymailmerge - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Name = "mailmerge.zip"; - Styles = (ARCHIVE); -End -#endif -#endif diff --git a/scp2/source/python/module_python_mailmerge.ulf b/scp2/source/python/module_python_mailmerge.ulf deleted file mode 100644 index 36b479d..0000000 --- a/scp2/source/python/module_python_mailmerge.ulf +++ /dev/null @@ -1,23 +0,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 . - */ - -[STR_NAME_MODULE_OPTIONAL_PYTHON_MAILMERGE] -en-US = "E-mail Mailmerge" - -[STR_DESC_MODULE_OPTIONAL_PYTHON_MAILMERGE] -en-US = "Module for %PRODUCTNAME E-mail Mailmerge feature" diff --git a/scp2/source/python/profileitem_python.scp b/scp2/source/python/profileitem_python.scp index aa14834..b14947a 100644 --- a/scp2/source/python/profileitem_python.scp +++ b/scp2/source/python/profileitem_python.scp @@ -30,7 +30,7 @@ #ifndef DISABLE_PYUNO Profile gid_Profile_Pythonloader_Uno_Ini - ModuleID = gid_Module_Optional_Pyuno; + ModuleID = gid_Module_Pyuno; #ifdef UNX Name = "pythonloader.unorc"; #else @@ -43,7 +43,7 @@ End #ifndef SYSTEM_PYTHON ProfileItem gid_Profileitem_Pythonloader_Pythonhome ProfileID = gid_Profile_Pythonloader_Uno_Ini; - ModuleID = gid_Module_Optional_Pyuno; + ModuleID = gid_Module_Pyuno; Section = "Bootstrap"; Order = 1; Key = "PYUNO_LOADER_PYTHONHOME"; @@ -57,7 +57,7 @@ End ProfileItem gid_Profileitem_Pythonloader_Pythonpath ProfileID = gid_Profile_Pythonloader_Uno_Ini; - ModuleID = gid_Module_Optional_Pyuno; + ModuleID = gid_Module_Pyuno; Section = "Bootstrap"; Order = 1; Key = "PYUNO_LOADER_PYTHONPATH"; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits