mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch from python to python3

Browse Source 
Mac specific parts of patch by:
Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>

Change-Id: I90ef17c6f5a678230539a80ab999fa5344e4fc8f
This commit is contained in:
Michael Stahl
2012-11-17 00:35:35 +01:00
parent 6f8f95fed7
commit 38a22a9026
14 changed files with 154 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

187
scp2/source/python/file_python.scp
View File

@@ -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,21 +202,53 @@ 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_LibreOfficePython
BIN_FILE_BODY;
Dir = gid_Dir_PythonFramework;
Name = "LibreOfficePython";
Target = "Versions/Current/LibreOfficePython";
Styles = ();
End
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 = "idle";
Name = "idle3";
Target = STRING(CONCAT2(idle,PYMAJMIN));
Styles = ();
End
@@ -249,23 +256,15 @@ End
Unixlink gid_Unixlink_Python_bin_pydoc
BIN_FILE_BODY;
Dir = gid_Dir_PythonFramework_Versions_ver_bin;
Name = "pydoc";
Name = "pydoc3";
Target = STRING(CONCAT2(pydoc,PYMAJMIN));
Styles = ();
End
Unixlink gid_Unixlink_Python_bin_python_real
BIN_FILE_BODY;
Dir = gid_Dir_PythonFramework_Versions_ver_bin;
Name = "python";
Target = "../Resources/Python.app/Contents/MacOS/OOoPython";
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
BIN_FILE_BODY;
Dir = gid_Dir_PythonFramework_Versions_ver_bin;
Name = "pythonw";
Target = "../Resources/Python.app/Contents/MacOS/OOoPython";
Styles = ();
End
Unixlink gid_Unixlink_Python_bin_pythonw
BIN_FILE_BODY;
Dir = gid_Dir_PythonFramework_Versions_ver_bin;
Name = "pythonw";
Name = "pythonw3";
Target = STRING(CONCAT2(pythonw,PYMAJMIN));
Styles = ();
End
Unixlink gid_Unixlink_Python_bin_smtpdpy
Unixlink gid_Unixlink_Python_bin_pyvenv
BIN_FILE_BODY;
Dir = gid_Dir_PythonFramework_Versions_ver_bin;
Name = "smtpd.py";
Target = STRING(CONCAT3(smtpd,PYMAJMIN,.py));
Name = "pyvenv";
Target = STRING(CONCAT2(pyvenv-,PYMAJMIN));
Styles = ();
End
Unixlink gid_Unixlink_Python_libpython
BIN_FILE_BODY;
Dir = gid_Dir_PythonFramework_Versions_ver_lib;
Name = STRING(CONCAT3(libpython,PYMAJMIN,.dylib));
Target = "../LibreOfficePython";
Styles = ();
End
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