summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-11-26 17:20:52 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-11-26 17:21:12 +0100
commita756b783e3cdb9234a375014e91487ae84921170 (patch)
tree27126a20771fe83ebb9e7c6694d41529a943311a /scp2
parent004e515ba659edd8cd9c3d915c1c0722be7e252c (diff)
Use Package_pyuno_pythonloader_ini for install
Change-Id: Ia4f06beea2e16b6a0235c87ae47cec8430cd1f40
Diffstat (limited to 'scp2')
-rw-r--r--scp2/InstallModule_python.mk1
-rw-r--r--scp2/source/python/profileitem_python.scp83
2 files changed, 0 insertions, 84 deletions
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