Use Package_pyuno_pythonloader_ini for install

Change-Id: Ia4f06beea2e16b6a0235c87ae47cec8430cd1f40

3 files changed, 6 insertions, 84 deletions

diff --git a/Repository.mk b/Repository.mk
index 9078590b502c..5476f89c5cdc 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -840,6 +840,12 @@ $(eval $(call gb_Helper_register_packages_for_install,writer_brand,\
 ))
 endif # GUIBASE=unx
 
+ifneq ($(DISABLE_PYTHON),TRUE)
+$(eval $(call gb_Helper_register_packages_for_install,python, \
+    pyuno_pythonloader_ini \
+))
+endif
+
 # External executables
 $(eval $(call gb_ExternalExecutable_register_executables,\
 	genbrk \
diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk
index 68d23cf0f648..30ca82133a31 100644
--- a/scp2/InstallModule_python.mk
+++ b/scp2/InstallModule_python.mk
@@ -46,7 +46,6 @@ endif
 $(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 \
 ))
 
diff --git a/scp2/source/python/profileitem_python.scp b/scp2/source/python/profileitem_python.scp
deleted file mode 100644
index 29d33e8c43e7..000000000000
--- a/scp2/source/python/profileitem_python.scp
+++ /dev/null
@@ -1,83 +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 .
- */
-
-#include "macros.inc"
-
-#ifndef DISABLE_PYUNO
-
-Profile gid_Profile_Pythonloader_Uno_Ini
-    ModuleID = gid_Module_Pyuno;
-  #ifdef UNX
-    Name = "pythonloader.unorc";
-  #else
-    Name = "pythonloader.uno.ini";
-  #endif
-    Dir = GID_BRAND_DIR_ETC;
-    Styles = (NETWORK);
-End
-
-#ifndef SYSTEM_PYTHON
-ProfileItem gid_Profileitem_Pythonloader_Pythonhome
-    ProfileID = gid_Profile_Pythonloader_Uno_Ini;
-    ModuleID = gid_Module_Pyuno;
-    Section = "Bootstrap";
-    Order = 1;
-    Key = "PYUNO_LOADER_PYTHONHOME";
-  #if defined MACOSX
-    Value = "$ORIGIN/../Frameworks/LibreOfficePython.framework";
-  #else
-    Value = CONCAT2($ORIGIN/python-core-,PYVERSION);
-  #endif
-End
-#endif
-
-ProfileItem gid_Profileitem_Pythonloader_Pythonpath
-    ProfileID = gid_Profile_Pythonloader_Uno_Ini;
-    ModuleID = gid_Module_Pyuno;
-    Section = "Bootstrap";
-    Order = 1;
-    Key = "PYUNO_LOADER_PYTHONPATH";
-  #if defined SYSTEM_PYTHON
-    Value = "$ORIGIN";
-  #elif defined MACOSX
-    #define FRAMEWORKLIB CONCAT2($ORIGIN/../Frameworks/LibreOfficePython.framework/Versions/Current/lib/python,PYMAJMIN)
-    Value = CONCAT4(FRAMEWORKLIB FRAMEWORKLIB,
-		   /lib-dynload FRAMEWORKLIB,
-		   /lib-tk FRAMEWORKLIB,
-		   /site-packages $ORIGIN);
-  #elif defined UNX
-    Value = CONCAT9($ORIGIN/python-core-,PYVERSION,
-		   /lib $ORIGIN/python-core-,PYVERSION,
-		   /lib/lib-dynload $ORIGIN/python-core-,PYVERSION,
-		   /lib/lib-tk $ORIGIN/python-core-,PYVERSION,
-		   /lib/site-packages $ORIGIN);
-  #elif defined _gcc3
-    Value = STRING(CONCAT9($ORIGIN/python-core-,PYVERSION,
-		   /lib $ORIGIN/python-core-,PYVERSION,
-		   /lib/lib-dynload $ORIGIN/python-core-,PYVERSION,
-		   /lib/lib-tk $ORIGIN/python-core-,PYVERSION,
-		   /lib/site-packages $ORIGIN));
-  #else
-    Value = STRING(CONCAT5($ORIGIN/python-core-,PYVERSION,
-                   /lib $ORIGIN/python-core-,PYVERSION,
-		   /lib/site-packages $ORIGIN));
-  #endif
-End
-
-// DISABLE_PYUNO
-#endif