Changeset 3402

Timestamp:

Jun 11, 2007, 12:50:36 AM (18 years ago)

Author:

bird

Message:

os2emx -> os2knix.

Location:

trunk/essentials/dev-lang/python

Files:

• Lib/distutils/ccompiler.py (modified) (2 diffs)
• Lib/distutils/unixccompiler.py (modified) (1 diff)
• Lib/os.py (modified) (1 diff)
• Lib/popen2.py (modified) (1 diff)
• Lib/tempfile.py (modified) (1 diff)
• Lib/test/regrtest.py (modified) (1 diff)
• Lib/test/test_tempfile.py (modified) (2 diffs)
• Makefile.pre.in (modified) (1 diff)
• configure.in (modified) (2 diffs)

trunk/essentials/dev-lang/python/Lib/distutils/ccompiler.py

@@ -1026 +1026 @@
     def debug_print (self, msg):
         from distutils.debug import DEBUG
-        if DEBUG:
-            print msg
+        # if DEBUG:
+        print msg
 
     def warn (self, msg):
@@ -1059 +1059 @@
     # compiler
     ('cygwin.*', 'unix'),
-    ('os2emx', 'emx'),
+    ('os2knix', 'unix'),
+    #('os2emx', 'emx'), - revert later.
 
     # OS name mappings

trunk/essentials/dev-lang/python/Lib/distutils/unixccompiler.py

@@ -120 +120 @@
     dylib_lib_extension = ".dylib"
     static_lib_format = shared_lib_format = dylib_lib_format = "lib%s%s"
-    if sys.platform == "cygwin":
+    if sys.platform == "cygwin" or sys.platform == "os2emx":
         exe_extension = ".exe"
 

trunk/essentials/dev-lang/python/Lib/os.py

@@ -75 +75 @@
     except ImportError:
         pass
-    if sys.version.find('EMX GCC') == -1:
+    if sys.version.find('EMX GCC') == -1 and sys.platform != 'os2knix':
         import ntpath as path
     else:

trunk/essentials/dev-lang/python/Lib/popen2.py

@@ -136 +136 @@
 
 
-if sys.platform[:3] == "win" or sys.platform == "os2emx":
+if sys.platform[:3] == "win" or sys.platform == "os2emx" or sys.platform == "os2knix":
     # Some things don't make sense on non-Unix platforms.
     del Popen3, Popen4

trunk/essentials/dev-lang/python/Lib/tempfile.py

@@ -437 +437 @@
     return _TemporaryFileWrapper(file, name)
 
-if _os.name != 'posix' or _os.sys.platform == 'cygwin' or _os.sys.platform == 'os2emx':
+if _os.name != 'posix' or _os.sys.platform == 'cygwin' or _os.sys.platform == 'os2emx' or _os.sys.platform == 'os2knix':
     # On non-POSIX and Cygwin systems, assume that we cannot unlink a file
     # while it is open.

trunk/essentials/dev-lang/python/Lib/test/regrtest.py

@@ -1181 +1181 @@
         test_sunaudiodev
         """,
+    'os2knix':
+        """
+        test_al
+        test_applesingle
+        test_audioop
+        test_bsddb185
+        test_bsddb3
+        test_cd
+        test_cl
+        test_commands
+        test_dl
+        test_gl
+        test_imgfile
+        test_linuxaudiodev
+        test_mhlib
+        test_mmap
+        test_nis
+        test_openpty
+        test_ossaudiodev
+        test_pty
+        test_resource
+        test_sqlite
+        test_startfile
+        test_sunaudiodev
+        """,
     'freebsd4':
         """

trunk/essentials/dev-lang/python/Lib/test/test_tempfile.py

@@ -265 +265 @@
         mode = stat.S_IMODE(os.stat(file.name).st_mode)
         expected = 0600
-        if sys.platform in ('win32', 'os2emx', 'mac'):
+        if sys.platform in ('win32', 'os2emx', 'os2knix', 'mac'):
             # There's no distinction among 'user', 'group' and 'world';
             # replicate the 'user' bits.
@@ -484 +484 @@
             mode &= 0777 # Mask off sticky bits inherited from /tmp
             expected = 0700
-            if sys.platform in ('win32', 'os2emx', 'mac'):
+            if sys.platform in ('win32', 'os2emx', 'os2knix', 'mac'):
                 # There's no distinction among 'user', 'group' and 'world';
                 # replicate the 'user' bits.

trunk/essentials/dev-lang/python/Makefile.pre.in

@@ -409 +409 @@
         $(LN) -fsn Versions/Current/Resources $(PYTHONFRAMEWORKDIR)/Resources
 
-ifeq ($(MACHDEP),os2emx) # bird hack!   
+ifneq ($(filter os2emx os2knix,$(MACHDEP)),) # bird hack!
 $(DLLLIBRARY) $(LDLIBRARY): $(LIBRARY_OBJS)
         $(LDSHARED) -o $(DLLLIBRARY) $^ $(LIBS) $(MODLIBS) $(SYSLIBS)

trunk/essentials/dev-lang/python/configure.in

@@ -184 +184 @@
         atheos*) MACHDEP="atheos";;
         irix646) MACHDEP="irix6";;
-        os2*|OS/2*|emx*) MACHDEP="os2emx";;
+        os2*|OS/2*|emx*) MACHDEP="os2knix";;
 
         '')     MACHDEP="unknown";;
@@ -3419 +3419 @@
 if test ! -f Modules/Setup
 then
-        if test "$MACHDEP" = "os2emx"; then
+        if test "$MACHDEP" = "os2emx"  -o  "$MACHDEP" = "os2knix"; then
         cp $srcdir/PC/os2emx/Setup.os2emx Modules/Setup
     else