From 38a22a9026a3d8a67f3e16ec650960a10b527d25 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Sat, 17 Nov 2012 00:35:35 +0100 Subject: Switch from python to python3 Mac specific parts of patch by: Christian Lohmaier Change-Id: I90ef17c6f5a678230539a80ab999fa5344e4fc8f --- scp2/InstallModule_python.mk | 1 + scp2/prj/build.lst | 2 +- scp2/source/python/file_python.scp | 185 +++++++++++++++++++----------- scp2/source/python/module_python.scp | 18 ++- scp2/source/python/profileitem_python.scp | 4 +- 5 files changed, 132 insertions(+), 78 deletions(-) (limited to 'scp2') diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk index 32516b3117b7..6e2c6d09ee33 100644 --- a/scp2/InstallModule_python.mk +++ b/scp2/InstallModule_python.mk @@ -50,6 +50,7 @@ include $(OUTDIR)/inc/pyversion.Makefile $(eval $(call gb_InstallModule_add_defs,scp2/python,\ -DPYVERSION=$(PYVERSION) \ -DPYMAJMIN=$(PYMAJOR).$(PYMINOR) \ + -DPYMAJOR=$(PYMAJOR) \ -DPY_FULL_DLL_NAME=$(PY_FULL_DLL_NAME) \ )) endif diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst index 19b2e9664a79..b6a6b2e8f590 100644 --- a/scp2/prj/build.lst +++ b/scp2/prj/build.lst @@ -1,3 +1,3 @@ -cp scp2 : i18npool DESKTOP:l10ntools PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL +cp scp2 : i18npool DESKTOP:l10ntools PYTHON:python3 ICU:icu REDLAND:redland LIBXSLT:libxslt NULL cp scp2 usr1 - all cp_mkout NULL cp scp2\prj nmake - all cp_prj NULL diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index 305a3e64879f..fc4db23883c1 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -96,7 +96,7 @@ File gid_File_Py_Python_Core TXT_FILE_BODY; #ifdef MACOSX Dir = gid_Brand_Dir_Program; - Name = "OOoPython.framework.zip"; + Name = "LibreOfficePython.framework.zip"; Styles = (ARCHIVE,USE_INTERNAL_RIGHTS); #else Dir = gid_Dir_Py_PythonCore_Lib; @@ -153,35 +153,21 @@ File gid_File_Lib_Python_So Name = STRING(PY_FULL_DLL_NAME); Styles = (PACKED); End -#ifdef UNX -Shortcut gid_Shortcut_Lib_Python_So - FileID = gid_File_Lib_Python_So; +File gid_File_Lib_Python3_So + LIB_FILE_BODY; Dir = gid_Brand_Dir_Program; - Name = STRING(CONCAT3(libpython,PYMAJMIN,UNXSUFFIX)); - Styles = (NETWORK,RELATIVE); -End +#ifdef UNX + Name = STRING(CONCAT3(libpython,PYMAJOR,UNXSUFFIX)); +#else // WNT + Name = STRING(CONCAT3(python,PYMAJOR,.dll)); #endif //UNX + Styles = (PACKED); +End #else //MACOSX //directory entries solely to be able to create the symlinks Directory gid_Dir_PythonFramework ParentID = gid_Brand_Dir_Program; - HostName = "OOoPython.framework"; -End - -Unixlink gid_Unixlink_Python_Headers - BIN_FILE_BODY; - Dir = gid_Dir_PythonFramework; - Name = "Headers"; - Target = "Versions/Current/Headers"; - Styles = (); -End - -Unixlink gid_Unixlink_Python_Resources - BIN_FILE_BODY; - Dir = gid_Dir_PythonFramework; - Name = "Resources"; - Target = "Versions/Current/Resources"; - Styles = (); + HostName = "LibreOfficePython.framework"; End Directory gid_Dir_PythonFramework_Versions @@ -189,27 +175,11 @@ Directory gid_Dir_PythonFramework_Versions HostName = "Versions"; End -Unixlink gid_Unixlink_Python_Versions_Current - BIN_FILE_BODY; - Dir = gid_Dir_PythonFramework_Versions; - Name = "Current"; - Target = STRING(PYMAJMIN); - Styles = (); -End - Directory gid_Dir_PythonFramework_Versions_ver ParentID = gid_Dir_PythonFramework_Versions; HostName = STRING(PYMAJMIN); End -Unixlink gid_Unixlink_Python_Versions_ver_Headers - BIN_FILE_BODY; - Dir = gid_Dir_PythonFramework_Versions_ver; - Name = "Headers"; - Target = STRING(CONCAT2(include/python,PYMAJMIN)); - Styles = (); -End - Directory gid_Dir_PythonFramework_Versions_ver_bin ParentID = gid_Dir_PythonFramework_Versions_ver; HostName = "bin"; @@ -220,6 +190,11 @@ Directory gid_Dir_PythonFramework_Versions_ver_lib HostName = "lib"; End +Directory gid_Dir_PythonFramework_Versions_ver_lib_pkgconfig + ParentID = gid_Dir_PythonFramework_Versions_ver_lib; + HostName = "pkgconfig"; +End + Directory gid_Dir_PythonFramework_Versions_ver_lib_pythonver ParentID = gid_Dir_PythonFramework_Versions_ver_lib; HostName = STRING(CONCAT2(python,PYMAJMIN)); @@ -227,45 +202,69 @@ End Directory gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config ParentID = gid_Dir_PythonFramework_Versions_ver_lib_pythonver; - HostName = "config"; + HostName = STRING(CONCAT3(config-,PYMAJMIN,m)); End -Unixlink gid_Unixlink_Python_OOoPython +Unixlink gid_Unixlink_Python_Headers BIN_FILE_BODY; Dir = gid_Dir_PythonFramework; - Name = "OOoPython"; - Target = "Versions/Current/OOoPython"; + Name = "Headers"; + Target = "Versions/Current/Headers"; Styles = (); End -Unixlink gid_Unixlink_Python_bin_idle +Unixlink gid_Unixlink_Python_LibreOfficePython BIN_FILE_BODY; - Dir = gid_Dir_PythonFramework_Versions_ver_bin; - Name = "idle"; - Target = STRING(CONCAT2(idle,PYMAJMIN)); + Dir = gid_Dir_PythonFramework; + Name = "LibreOfficePython"; + Target = "Versions/Current/LibreOfficePython"; Styles = (); End -Unixlink gid_Unixlink_Python_bin_pydoc +Unixlink gid_Unixlink_Python_Resources + BIN_FILE_BODY; + Dir = gid_Dir_PythonFramework; + Name = "Resources"; + Target = "Versions/Current/Resources"; + Styles = (); +End + +Unixlink gid_Unixlink_Python_Versions_Current + BIN_FILE_BODY; + Dir = gid_Dir_PythonFramework_Versions; + Name = "Current"; + Target = STRING(PYMAJMIN); + Styles = (); +End + +Unixlink gid_Unixlink_Python_Versions_ver_Headers + BIN_FILE_BODY; + Dir = gid_Dir_PythonFramework_Versions_ver; + Name = "Headers"; + Target = STRING(CONCAT3(include/python,PYMAJMIN,m)); + Styles = (); +End + +Unixlink gid_Unixlink_Python_bin_idle BIN_FILE_BODY; Dir = gid_Dir_PythonFramework_Versions_ver_bin; - Name = "pydoc"; - Target = STRING(CONCAT2(pydoc,PYMAJMIN)); + Name = "idle3"; + Target = STRING(CONCAT2(idle,PYMAJMIN)); Styles = (); End -Unixlink gid_Unixlink_Python_bin_python_real +Unixlink gid_Unixlink_Python_bin_pydoc BIN_FILE_BODY; Dir = gid_Dir_PythonFramework_Versions_ver_bin; - Name = "python"; - Target = "../Resources/Python.app/Contents/MacOS/OOoPython"; + Name = "pydoc3"; + Target = STRING(CONCAT2(pydoc,PYMAJMIN)); Styles = (); End Unixlink gid_Unixlink_Python_bin_python BIN_FILE_BODY; Dir = gid_Dir_PythonFramework_Versions_ver_bin; - Name = "python"; + Name = "python3"; Target = STRING(CONCAT2(python,PYMAJMIN)); Styles = (); End @@ -273,40 +272,88 @@ End Unixlink gid_Unixlink_Python_bin_pythonconfig BIN_FILE_BODY; Dir = gid_Dir_PythonFramework_Versions_ver_bin; - Name = "python-config"; + Name = "python3-config"; Target = STRING(CONCAT3(python,PYMAJMIN,-config)); Styles = (); End -Unixlink gid_Unixlink_Python_bin_pythonw_real +Unixlink gid_Unixlink_Python_bin_pythonw BIN_FILE_BODY; Dir = gid_Dir_PythonFramework_Versions_ver_bin; - Name = "pythonw"; - Target = "../Resources/Python.app/Contents/MacOS/OOoPython"; + Name = "pythonw3"; + Target = STRING(CONCAT2(pythonw,PYMAJMIN)); Styles = (); End -Unixlink gid_Unixlink_Python_bin_pythonw +Unixlink gid_Unixlink_Python_bin_pyvenv BIN_FILE_BODY; Dir = gid_Dir_PythonFramework_Versions_ver_bin; - Name = "pythonw"; - Target = STRING(CONCAT2(pythonw,PYMAJMIN)); + Name = "pyvenv"; + Target = STRING(CONCAT2(pyvenv-,PYMAJMIN)); Styles = (); End -Unixlink gid_Unixlink_Python_bin_smtpdpy +Unixlink gid_Unixlink_Python_libpython BIN_FILE_BODY; - Dir = gid_Dir_PythonFramework_Versions_ver_bin; - Name = "smtpd.py"; - Target = STRING(CONCAT3(smtpd,PYMAJMIN,.py)); + Dir = gid_Dir_PythonFramework_Versions_ver_lib; + Name = STRING(CONCAT3(libpython,PYMAJMIN,.dylib)); + Target = "../LibreOfficePython"; Styles = (); End -Unixlink gid_Unixlink_Python_libpython +Unixlink gid_Unixlink_Python_libpython_m + BIN_FILE_BODY; + Dir = gid_Dir_PythonFramework_Versions_ver_lib; + Name = STRING(CONCAT3(libpython,PYMAJMIN,m.dylib)); + Target = "../LibreOfficePython"; + Styles = (); +End + +Unixlink gid_Unixlink_Python_pkgconfig + BIN_FILE_BODY; + Dir = gid_Dir_PythonFramework_Versions_ver_lib_pkgconfig; + Name = "python3.pc"; + Target = STRING(CONCAT3(python-,PYMAJMIN,.pc)); + Styles = (); +End + +Unixlink gid_Unixlink_Python_pkgconfig_m + BIN_FILE_BODY; + Dir = gid_Dir_PythonFramework_Versions_ver_lib_pkgconfig; + Name = STRING(CONCAT3(python-,PYMAJMIN,m.pc)); + Target = STRING(CONCAT3(python-,PYMAJMIN,.pc)); + Styles = (); +End + +Unixlink gid_Unixlink_Python_libpython_config_a BIN_FILE_BODY; Dir = gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config; - Name = STRING(PY_FULL_DLL_NAME); - Target = "../../../OOoPython"; + Name = STRING(CONCAT3(libpython,PYMAJMIN,.a)); + Target = "../../../LibreOfficePython"; + Styles = (); +End + +Unixlink gid_Unixlink_Python_libpython_config_dylib + BIN_FILE_BODY; + Dir = gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config; + Name = STRING(CONCAT3(libpython,PYMAJMIN,.dylib)); + Target = "../../../LibreOfficePython"; + Styles = (); +End + +Unixlink gid_Unixlink_Python_libpython_m_config_a + BIN_FILE_BODY; + Dir = gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config; + Name = STRING(CONCAT3(libpython,PYMAJMIN,m.a)); + Target = "../../../LibreOfficePython"; + Styles = (); +End + +Unixlink gid_Unixlink_Python_libpython_m_config_dylib + BIN_FILE_BODY; + Dir = gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config; + Name = STRING(CONCAT3(libpython,PYMAJMIN,m.dylib)); + Target = "../../../LibreOfficePython"; Styles = (); End #endif //MACOSX diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp index d379f2744f6d..629a864ad82a 100644 --- a/scp2/source/python/module_python.scp +++ b/scp2/source/python/module_python.scp @@ -39,6 +39,7 @@ Module gid_Module_Optional_Pyuno gid_Dir_PythonFramework_Versions_ver, gid_Dir_PythonFramework_Versions_ver_bin, gid_Dir_PythonFramework_Versions_ver_lib, + gid_Dir_PythonFramework_Versions_ver_lib_pkgconfig, gid_Dir_PythonFramework_Versions_ver_lib_pythonver, gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config, gid_Dir_Py_PythonCore, @@ -54,23 +55,28 @@ Module gid_Module_Optional_Pyuno gid_File_Py_Python_Core, gid_File_Py_Python_Bin, gid_File_Lib_Python_So, - gid_Shortcut_Lib_Python_So, + gid_File_Lib_Python3_So, gid_File_Scripts_Python, gid_File_Share_Registry_Pyuno_Xcd); Unixlinks = (gid_Unixlink_Python_Headers, + gid_Unixlink_Python_LibreOfficePython, gid_Unixlink_Python_Resources, gid_Unixlink_Python_Versions_Current, gid_Unixlink_Python_Versions_ver_Headers, - gid_Unixlink_Python_OOoPython, gid_Unixlink_Python_bin_idle, gid_Unixlink_Python_bin_pydoc, - gid_Unixlink_Python_bin_python_real, gid_Unixlink_Python_bin_python, gid_Unixlink_Python_bin_pythonconfig, - gid_Unixlink_Python_bin_pythonw_real, gid_Unixlink_Python_bin_pythonw, - gid_Unixlink_Python_bin_smtpdpy, - gid_Unixlink_Python_libpython); + gid_Unixlink_Python_bin_pyvenv, + gid_Unixlink_Python_libpython, + gid_Unixlink_Python_libpython_m, + gid_Unixlink_Python_pkgconfig, + gid_Unixlink_Python_pkgconfig_m, + gid_Unixlink_Python_libpython_config_a, + gid_Unixlink_Python_libpython_config_dylib, + gid_Unixlink_Python_libpython_m_config_a, + gid_Unixlink_Python_libpython_m_config_dylib); Minimal = NO; Default = YES; Styles = ( ); diff --git a/scp2/source/python/profileitem_python.scp b/scp2/source/python/profileitem_python.scp index 46d515cd85a5..aa14834990a5 100644 --- a/scp2/source/python/profileitem_python.scp +++ b/scp2/source/python/profileitem_python.scp @@ -48,7 +48,7 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonhome Order = 1; Key = "PYUNO_LOADER_PYTHONHOME"; #ifdef MACOSX - Value = CONCAT2($ORIGIN,"OOoPython.framework"); + Value = CONCAT2($ORIGIN,/LibreOfficePython.framework); #else Value = CONCAT2($ORIGIN/python-core-,PYVERSION); #endif @@ -66,7 +66,7 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonpath #else #ifdef UNX #ifdef MACOSX - #define FRAMEWORKLIB CONCAT4($ORIGIN/OOoPython.framework/Versions/,PYMAJMIN,/lib/python,PYMAJMIN) + #define FRAMEWORKLIB CONCAT3($ORIGIN,/LibreOfficePython.framework/Versions/Current/lib/python,PYMAJMIN) Value = CONCAT4(FRAMEWORKLIB FRAMEWORKLIB, /lib-dynload FRAMEWORKLIB, /lib-tk FRAMEWORKLIB, -- cgit