(original) (raw)

changeset: 79476:42c063b3821f user: Jesus Cea jcea@jcea.es date: Fri Oct 05 02:27:40 2012 +0200 files: Include/osdefs.h Include/pyport.h PC/python.mk PC/readme.txt Tools/freeze/freeze.py description: #16135: Removal of OS/2 support (C code and Docs) diff -r dea15868963f -r 42c063b3821f Include/osdefs.h --- a/Include/osdefs.h Fri Oct 05 02:11:36 2012 +0200 +++ b/Include/osdefs.h Fri Oct 05 02:27:40 2012 +0200 @@ -9,16 +9,10 @@ /* Mod by chrish: QNX has WATCOM, but isn't DOS */ #if !defined(__QNX__) -#if defined(MS_WINDOWS) || defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__DJGPP__) || defined(PYOS_OS2) -#if defined(PYOS_OS2) && defined(PYCC_GCC) -#define MAXPATHLEN 260 -#define SEP L'/' -#define ALTSEP L'\\' -#else +#if defined(MS_WINDOWS) || defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__DJGPP__) #define SEP L'\\' #define ALTSEP L'/' #define MAXPATHLEN 256 -#endif #define DELIM L';' #endif #endif diff -r dea15868963f -r 42c063b3821f Include/pyport.h --- a/Include/pyport.h Fri Oct 05 02:11:36 2012 +0200 +++ b/Include/pyport.h Fri Oct 05 02:27:40 2012 +0200 @@ -379,9 +379,6 @@ #endif #ifdef HAVE_SYS_STAT_H -#if defined(PYOS_OS2) && defined(PYCC_GCC) -#include -#endif #include #elif defined(HAVE_STAT_H) #include diff -r dea15868963f -r 42c063b3821f PC/python.mk --- a/PC/python.mk Fri Oct 05 02:11:36 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -project : n:\python\python-1.5.1\pc\wat_os2\pyth_os2.exe n:\python\python-1.& -5.1\pc\wat_dos\pyth_dos.exe .SYMBOLIC - -!include n:\python\python-1.5.1\pc\wat_os2\pyth_os2.mk1 -!include n:\python\python-1.5.1\pc\wat_dos\pyth_dos.mk1 diff -r dea15868963f -r 42c063b3821f PC/readme.txt --- a/PC/readme.txt Fri Oct 05 02:11:36 2012 +0200 +++ b/PC/readme.txt Fri Oct 05 02:27:40 2012 +0200 @@ -79,19 +79,6 @@ The subdirectories VC6, VS7.1 and VS8.0 contain legacy support older versions of Microsoft Visual Studio. See PCbuild/readme.txt. -EMX development tools for OS/2 -============================== - -See os2emx/readme.txt. This platform is maintained by Andrew MacIntyre. - -IBM VisualAge C/C++ for OS/2 -============================ - -See os2vacpp/readme.txt. This platform is supported by Jeff Rush. - -NOTE: Support for os2vacpp may be dropped in the near future. Please move - to EMX. - Note for Windows 3.x and DOS users ================================== diff -r dea15868963f -r 42c063b3821f Tools/freeze/freeze.py --- a/Tools/freeze/freeze.py Fri Oct 05 02:11:36 2012 +0200 +++ b/Tools/freeze/freeze.py Fri Oct 05 02:27:40 2012 +0200 @@ -125,7 +125,7 @@ # default the exclude list for each platform if win: exclude = exclude + [ 'dos', 'dospath', 'mac', 'macpath', 'macfs', 'MACFS', 'posix', - 'os2', 'ce', + 'ce', ] fail_import = exclude[:]/jcea@jcea.es