INTEGRATION: CWS pythonupgrade (1.4.96); FILE MERGED
2004/09/30 21:10:57 jbu 1.4.96.1: #i32901# replaced version 2.2.2 with the defines from pyversion.mk, so that further python upgrades should be less difficult
This commit is contained in:
@@ -2,9 +2,9 @@
|
||||
*
|
||||
* $RCSfile: file_python.scp,v $
|
||||
*
|
||||
* $Revision: 1.4 $
|
||||
* $Revision: 1.5 $
|
||||
*
|
||||
* last change: $Author: obo $ $Date: 2004-07-05 13:19:01 $
|
||||
* last change: $Author: obo $ $Date: 2004-11-15 13:16:02 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
@@ -108,7 +108,7 @@ End
|
||||
File gid_File_Py_Python_Core
|
||||
TXT_FILE_BODY;
|
||||
Dir = gid_Dir_Program;
|
||||
Name = "python-core-2.2.2.zip";
|
||||
Name = STRING(CONCAT3(python-core-,PYVERSION,.zip));
|
||||
Styles = (ARCHIVE);
|
||||
End
|
||||
|
||||
@@ -167,80 +167,13 @@ File gid_File_Registry_Spool_Oo_Scripting_Python_Xcu
|
||||
Name = "/registry/spool/org.openoffice.Office.Scripting-python.xcu";
|
||||
End
|
||||
|
||||
#ifdef WNT
|
||||
|
||||
File gid_File_Python_Dll
|
||||
TXT_FILE_BODY;
|
||||
Dir = gid_Dir_Program;
|
||||
Name = "python22.dll";
|
||||
Styles = (PACKED);
|
||||
End
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef UNX
|
||||
#ifndef MACOSX
|
||||
|
||||
File gid_File_Lib_Python_So
|
||||
TXT_FILE_BODY;
|
||||
Dir = gid_Dir_Program;
|
||||
Name = STRING(CONCAT3(libpython,UNXSUFFIX,.2.2.2));
|
||||
Name = STRING(PY_FULL_DLL_NAME);
|
||||
Styles = (PACKED);
|
||||
End
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef UNX
|
||||
#ifndef MACOSX
|
||||
|
||||
Shortcut gid_Shortcut_Lib_Python_1
|
||||
FileID = gid_File_Lib_Python_So;
|
||||
Dir = gid_Dir_Program;
|
||||
Name = STRING(CONCAT3(libpython,UNXSUFFIX,.2));
|
||||
Styles = (NETWORK,RELATIVE);
|
||||
End
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef UNX
|
||||
#ifdef MACOSX
|
||||
|
||||
File gid_File_Lib_Python_So
|
||||
TXT_FILE_BODY;
|
||||
Dir = gid_Dir_Program;
|
||||
Name = STRING(CONCAT2(libpython2.2,UNXSUFFIX));
|
||||
Styles = (PACKED);
|
||||
End
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef UNX
|
||||
#ifdef MACOSX
|
||||
|
||||
Shortcut gid_Shortcut_Lib_Python_1
|
||||
FileID = gid_File_Lib_Python_So;
|
||||
Dir = gid_Dir_Program;
|
||||
Name = STRING(CONCAT2(libpython2,UNXSUFFIX));
|
||||
Styles = (NETWORK,RELATIVE);
|
||||
End
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef UNX
|
||||
|
||||
Shortcut gid_Shortcut_Lib_Python_2
|
||||
FileID = gid_File_Lib_Python_So;
|
||||
Dir = gid_Dir_Program;
|
||||
Name = STRING(CONCAT2(libpython,UNXSUFFIX));
|
||||
Styles = (NETWORK,RELATIVE);
|
||||
End
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef UNX
|
||||
|
||||
File gid_File_Pyuno
|
||||
@@ -250,10 +183,6 @@ File gid_File_Pyuno
|
||||
Styles = (PACKED);
|
||||
End
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef UNX
|
||||
|
||||
File gid_File_Python_Sh
|
||||
BIN_FILE_BODY;
|
||||
Name = "python.sh";
|
||||
@@ -262,3 +191,4 @@ File gid_File_Python_Sh
|
||||
End
|
||||
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user