diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-08-16 11:08:32 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-08-18 21:11:16 +0300 |
| commit | c6a73009747814513ab5a7277c211449c7378870 (patch) | |
| tree | 2adc961b3c83deffcea251c41744f2626e476f38 /scp2/source/python | |
| parent | 18041138d3169d565755565bdbabd8de596b5ac7 (diff) | |
Use subfolder names from <config_folders.h>
Change all instances of hardcoded "program", "share" etc subfolder names to
use those from <config_folders.h> instead. In normal builds, the end result
will not change.
Change-Id: I91c95cd8e482818be67307e889ae6df887763f53
Diffstat (limited to 'scp2/source/python')
| -rw-r--r-- | scp2/source/python/file_python.scp | 31 | ||||
| -rw-r--r-- | scp2/source/python/profileitem_python.scp | 6 |
2 files changed, 8 insertions, 29 deletions
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index dbf59e670efd..e53763f89795 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -28,7 +28,7 @@ File gid_File_scriptproviderforpython End File gid_File_Lib_Pyuno - LIB_FILE_BODY; + PACKED_LIB_FILE_BODY; #ifdef UNX Name = STRING(CONCAT2(libpyuno,UNXSUFFIX)); #else @@ -38,8 +38,6 @@ File gid_File_Lib_Pyuno Name = "pyuno.pyd"; #endif // MSVC_PKG_DEBUG_RUNTIME #endif - Dir = gid_Brand_Dir_Program; - Styles = (PACKED); End STD_LIB_FILE( gid_File_Lib_Pythonloader, pythonloader ) @@ -51,26 +49,9 @@ File gid_File_Pyuno_Rdb Styles = (PACKED); End -File gid_File_Py_Unohelper - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Name = "pyuno/unohelper.py"; - Styles = (PACKED); -End - -File gid_File_Py_Uno - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Name = "pyuno/uno.py"; - Styles = (PACKED); -End - -File gid_File_Py_Pythonloader - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Name = "pyuno/pythonloader.py"; - Styles = (PACKED); -End +STD_PY_FILE(gid_File_Py_Unohelper, "pyuno/unohelper.py") +STD_PY_FILE(gid_File_Py_Uno, "pyuno/uno.py") +STD_PY_FILE(gid_File_Py_Pythonloader, "pyuno/pythonloader.py") #ifndef SYSTEM_PYTHON File gid_File_Py_Bin_Python @@ -130,10 +111,8 @@ End // pyuno.so even on Mac OS X, because it is a python module File gid_File_Pyuno - LIB_FILE_BODY; + PACKED_LIB_FILE_BODY; Name = "pyuno.so"; - Dir = gid_Brand_Dir_Program; - Styles = (PACKED); End #endif diff --git a/scp2/source/python/profileitem_python.scp b/scp2/source/python/profileitem_python.scp index 0bc2a86651d1..ee4dac62b9fa 100644 --- a/scp2/source/python/profileitem_python.scp +++ b/scp2/source/python/profileitem_python.scp @@ -27,7 +27,7 @@ Profile gid_Profile_Pythonloader_Uno_Ini #else Name = "pythonloader.uno.ini"; #endif - Dir = gid_Brand_Dir_Program; + Dir = GID_BRAND_DIR_ETC; Styles = (NETWORK); End @@ -39,7 +39,7 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonhome Order = 1; Key = "PYUNO_LOADER_PYTHONHOME"; #ifdef MACOSX - Value = CONCAT2($ORIGIN,/LibreOfficePython.framework); + Value = "$ORIGIN/../Frameworks/LibreOfficePython.framework"; #else Value = CONCAT2($ORIGIN/python-core-,PYVERSION); #endif @@ -57,7 +57,7 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonpath #else #ifdef UNX #ifdef MACOSX - #define FRAMEWORKLIB CONCAT3($ORIGIN,/LibreOfficePython.framework/Versions/Current/lib/python,PYMAJMIN) + #define FRAMEWORKLIB CONCAT3($ORIGIN,/../Frameworks/LibreOfficePython.framework/Versions/Current/lib/python,PYMAJMIN) Value = CONCAT4(FRAMEWORKLIB FRAMEWORKLIB, /lib-dynload FRAMEWORKLIB, /lib-tk FRAMEWORKLIB, |