Skip to content

C
core
Kaydet (Commit) e75e0214 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Fix PYUNO_LOADER_PYTHONPATH for non-ENABLE_MACOSX_MACLIKE_APP_STRUCTURE 

Change-Id: Ifc164b80466d3b847ce1214c28a1ba79fdfd690b
üst dccf47b7
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 13 deletions
scp2/source/python/profileitem_python.scp
Dosyayı görüntüle @ e75e0214
...@@ -41,7 +41,7 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonhome ...@@ -41,7 +41,7 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonhome
#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE #if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
Value = "$ORIGIN/../Frameworks/LibreOfficePython.framework"; Value = "$ORIGIN/../Frameworks/LibreOfficePython.framework";
#elif defined MACOSX #elif defined MACOSX
Value = CONCAT2($ORIGIN,/LibreOfficePython.framework); Value = "$ORIGIN/LibreOfficePython.framework";
#else #else
Value = CONCAT2($ORIGIN/python-core-,PYVERSION); Value = CONCAT2($ORIGIN/python-core-,PYVERSION);
#endif #endif
...@@ -54,37 +54,37 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonpath ...@@ -54,37 +54,37 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonpath
Section = "Bootstrap"; Section = "Bootstrap";
Order = 1; Order = 1;
Key = "PYUNO_LOADER_PYTHONPATH"; Key = "PYUNO_LOADER_PYTHONPATH";
#ifdef SYSTEM_PYTHON #if defined SYSTEM_PYTHON
Value = "$ORIGIN"; Value = "$ORIGIN";
#else #elif defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
#ifdef UNX #define FRAMEWORKLIB CONCAT2($ORIGIN/../Frameworks/LibreOfficePython.framework/Versions/Current/lib/python,PYMAJMIN)
#ifdef MACOSX
#define FRAMEWORKLIB CONCAT3($ORIGIN,/../Frameworks/LibreOfficePython.framework/Versions/Current/lib/python,PYMAJMIN)
Value = CONCAT4(FRAMEWORKLIB FRAMEWORKLIB, Value = CONCAT4(FRAMEWORKLIB FRAMEWORKLIB,
/lib-dynload FRAMEWORKLIB, /lib-dynload FRAMEWORKLIB,
/lib-tk FRAMEWORKLIB, /lib-tk FRAMEWORKLIB,
/site-packages $ORIGIN); /site-packages $ORIGIN);
#else #elif defined MACOSX
#define FRAMEWORKLIB CONCAT2($ORIGIN/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, Value = CONCAT9($ORIGIN/python-core-,PYVERSION,
/lib $ORIGIN/python-core-,PYVERSION, /lib $ORIGIN/python-core-,PYVERSION,
/lib/lib-dynload $ORIGIN/python-core-,PYVERSION, /lib/lib-dynload $ORIGIN/python-core-,PYVERSION,
/lib/lib-tk $ORIGIN/python-core-,PYVERSION, /lib/lib-tk $ORIGIN/python-core-,PYVERSION,
/lib/site-packages $ORIGIN); /lib/site-packages $ORIGIN);
#endif #elif defined _gcc3
#else
#ifdef _gcc3
Value = STRING(CONCAT9($ORIGIN/python-core-,PYVERSION, Value = STRING(CONCAT9($ORIGIN/python-core-,PYVERSION,
/lib $ORIGIN/python-core-,PYVERSION, /lib $ORIGIN/python-core-,PYVERSION,
/lib/lib-dynload $ORIGIN/python-core-,PYVERSION, /lib/lib-dynload $ORIGIN/python-core-,PYVERSION,
/lib/lib-tk $ORIGIN/python-core-,PYVERSION, /lib/lib-tk $ORIGIN/python-core-,PYVERSION,
/lib/site-packages $ORIGIN)); /lib/site-packages $ORIGIN));
#else #else
Value = STRING(CONCAT5($ORIGIN/python-core-,PYVERSION, Value = STRING(CONCAT5($ORIGIN/python-core-,PYVERSION,
/lib $ORIGIN/python-core-,PYVERSION, /lib $ORIGIN/python-core-,PYVERSION,
/lib/site-packages $ORIGIN)); /lib/site-packages $ORIGIN));
#endif
#endif #endif
#endif
End End
// DISABLE_PYUNO // DISABLE_PYUNO
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment