fdo#49202 install the "Python-UNO Bridge" component on Windows unconditionally

Change-Id: I1d9d62b024c4442182d67d93915af0f793265ebd

11 files changed, 30 insertions, 151 deletions

diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index 84d90af99353..5f9b41073383 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 54612fbd5e62..84fac6bafa28 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 27bdfc065833..61618c03d457 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 f1f604886fe5..630d32b98f18 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 fc4db23883c1..733371c76fc5 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 629a864ad82a..ec258cd8daba 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 4271d100e297..000000000000
--- 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 63982cbdf150..dac4a9c5fde6 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 cf5ad7e230d1..000000000000
--- 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 36b479d337be..000000000000
--- 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 aa14834990a5..b14947a9f449 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";