From b6bcbb675afedba0c47654dd78dc446dac0630d1 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Sun, 21 Apr 2013 14:34:50 +0200 Subject: replace python-core zip built in pyuno with direct use of Package - python3: deliver files to INSTDIR, with same layout as instset and do not deliver .lib files - pyuno: remove obsolete python.bin targets - pyuno: remove usage of CustomTarget_zip for WNT and non-Mac UNX platforms (sadly it is apparently still needed for "system" python on MinGW) - scp2: use the python3 filelist There is still a problem here because the installer does not currently allow to preserve the executable bit on files in a filelist - RepositoryExternal: run python executable from INSTDIR and link against libraries in UnpackedTarball dir Change-Id: I931ca0a8be6ff40051b1ca50da1f0770e6057832 Reviewed-on: https://gerrit.libreoffice.org/3525 Tested-by: LibreOffice gerrit bot Reviewed-by: Michael Stahl --- scp2/source/python/file_python.scp | 45 ++++++-------------------------------- 1 file changed, 7 insertions(+), 38 deletions(-) (limited to 'scp2') diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index 5dba2c7db5e3..c065ea4dbd9c 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -102,15 +102,16 @@ End #endif File gid_File_Py_Python_Core - TXT_FILE_BODY; +//FIXME the binaries and libs in the package need x bit but USE_INTERNAL_RIGHTS does not work so set BIN_FILE_BODY here as a temporary hack which makes everything executable + BIN_FILE_BODY; #ifdef MACOSX Dir = gid_Brand_Dir_Program; Name = "LibreOfficePython.framework.zip"; Styles = (ARCHIVE,USE_INTERNAL_RIGHTS); #else - Dir = gid_Dir_Py_PythonCore_Lib; - Name = STRING(CONCAT3(python-core-,PYVERSION,.zip)); - Styles = (ARCHIVE); + Dir = FILELIST_DIR; + Name = "python3.filelist"; + Styles = (FILELIST,USE_INTERNAL_RIGHTS); #endif End @@ -121,20 +122,7 @@ Directory gid_Dir_Py_PythonCore_Bin End #endif -#ifndef MACOSX -File gid_File_Py_Python_Bin - BIN_FILE_BODY; -#ifdef UNX - Dir = gid_Brand_Dir_Program; - Name = "python.bin"; -#else - Dir = gid_Dir_Py_PythonCore_Bin; - Name = EXENAME(python); -#endif - Styles = (PACKED); -End -#endif -#endif +#endif // SYSTEM_PYTHON //Scripting Framework Python example scripts @@ -155,26 +143,7 @@ File gid_File_Share_Registry_Pyuno_Xcd End #ifndef SYSTEM_PYTHON -#ifndef MACOSX -File gid_File_Lib_Python_So - LIB_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Name = STRING(PY_FULL_DLL_NAME); - Styles = (PACKED); -End -#ifndef MSVC_PKG_DEBUG_RUNTIME -File gid_File_Lib_Python3_So - LIB_FILE_BODY; - Dir = gid_Brand_Dir_Program; -#ifdef UNX - Name = STRING(CONCAT3(libpython,PYMAJOR,UNXSUFFIX)); -#else // WNT - Name = STRING(CONCAT3(python,PYMAJOR,.dll)); -#endif //UNX - Styles = (PACKED); -End -#endif -#else //MACOSX +#ifdef MACOSX //directory entries solely to be able to create the symlinks Directory gid_Dir_PythonFramework ParentID = gid_Brand_Dir_Program; -- cgit