Changeset 10 for python/trunk/Lib/distutils

Timestamp:

Sep 3, 2010, 5:33:06 PM (15 years ago)

Author:

Yuri Dario

Message:

python: merged offline changes.

Location:

python/trunk/Lib/distutils

Files:

• ccompiler.py (modified) (1 diff)
• command/bdist_rpm.py (modified) (3 diffs)
• command/install.py (modified) (2 diffs)
• emxccompiler.py (modified) (4 diffs)
• sysconfig.py (modified) (3 diffs)
• unixccompiler.py (modified) (2 diffs)

python/trunk/Lib/distutils/ccompiler.py

@@ -983 +983 @@
     # compiler
     ('cygwin.*', 'unix'),
+    ('os2knix', 'emx'),
     ('os2emx', 'emx'),
 

python/trunk/Lib/distutils/command/bdist_rpm.py

@@ -200 +200 @@
                   "--python and --fix-python are mutually exclusive options"
 
-        if os.name != 'posix':
+        if os.name != 'posix' and os.name != 'os2':
             raise DistutilsPlatformError, \
                   ("don't know how to create RPM "
@@ -323 +323 @@
         rpm_cmd = ['rpm']
         if os.path.exists('/usr/bin/rpmbuild') or \
+           os.path.exists('/usr/bin/rpmbuild.exe') or \
            os.path.exists('/bin/rpmbuild'):
             rpm_cmd = ['rpmbuild']
@@ -346 +347 @@
         q_cmd = r"rpm -q --qf '%s %s\n' --specfile '%s'" % (
             src_rpm, non_src_rpm, spec_path)
+        if os.name == 'os2':
+            q_cmd = q_cmd.replace( '%{', '%%{')
 
         out = os.popen(q_cmd)

python/trunk/Lib/distutils/command/install.py

@@ -284 +284 @@
 
         # Next, stuff that's wrong (or dubious) only on certain platforms.
-        if os.name != "posix":
+        if os.name != "posix" and os.name != "os2":
             if self.exec_prefix:
                 self.warn("exec-prefix option ignored on this platform")
@@ -299 +299 @@
         self.dump_dirs("pre-finalize_{unix,other}")
 
-        if os.name == 'posix':
+        if os.name == 'posix' or os.name == "os2":
             self.finalize_unix()
         else:

python/trunk/Lib/distutils/emxccompiler.py

@@ -64 +64 @@
         # Hard-code GCC because that's what this is all about.
         # XXX optimization, warnings etc. should be customizable.
-        self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
-                             compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
-                             linker_exe='gcc -Zomf -Zmt -Zcrtdll',
-                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
+        self.set_executables(compiler='gcc -g -O2 -march=i386 -mtune=i686 -fomit-frame-pointer -Wall',
+                             compiler_so='gcc -g -O2 -march=i386 -mtune=i686 -fomit-frame-pointer -Wall',
+                             linker_exe='gcc -Zomf -Zexe',
+                             linker_so='gcc -Zomf -Zdll')
 
         # want the gcc library statically linked (so that we don't have
@@ -139 +139 @@
                 "EXPORTS"]
             for sym in export_symbols:
-                contents.append('  "%s"' % sym)
+                contents.append('  "_%s"' % sym)
             self.execute(write_file, (def_file, contents),
                          "writing %s" % def_file)
@@ -209 +209 @@
     # to deal with file naming/searching differences
     def find_library_file(self, dirs, lib, debug=0):
-        shortlib = '%s.lib' % lib
-        longlib = 'lib%s.lib' % lib    # this form very rare
+        try_names = [lib + ".lib", lib + ".a", "lib" + lib + ".lib", "lib" + lib + ".a"]
 
         # get EMX's default library directory search path
@@ -218 +217 @@
             emx_dirs = []
 
+        #print "dirs:",dirs
         for dir in dirs + emx_dirs:
-            shortlibp = os.path.join(dir, shortlib)
-            longlibp = os.path.join(dir, longlib)
-            if os.path.exists(shortlibp):
-                return shortlibp
-            elif os.path.exists(longlibp):
-                return longlibp
+            for name in try_names:
+                libfile = os.path.join(dir, name)
+                #print "libfile:",libfile
+                if os.path.exists(libfile):
+                    return libfile
 
         # Oops, didn't find it in *any* of 'dirs'

python/trunk/Lib/distutils/sysconfig.py

@@ -91 +91 @@
             return os.path.join(prefix, "Include")
     elif os.name == "os2":
-        return os.path.join(prefix, "Include")
+        if python_build:
+            base = os.path.dirname(os.path.abspath(sys.executable))
+            if plat_specific:
+                inc_dir = base
+            else:
+                inc_dir = os.path.join(base, "Include")
+                if not os.path.exists(inc_dir):
+                    inc_dir = os.path.join(os.path.dirname(base), "Include")
+            return inc_dir
+        return os.path.join(prefix, "include", "python" + get_python_version())
     else:
         raise DistutilsPlatformError(
@@ -145 +154 @@
 
     elif os.name == "os2":
+        libpython = os.path.join(prefix,
+                                 "lib", "python" + get_python_version())
         if standard_lib:
-            return os.path.join(prefix, "Lib")
-        else:
-            return os.path.join(prefix, "Lib", "site-packages")
+            return libpython
+        else:
+            return os.path.join(libpython, "site-packages")
 
     else:
@@ -491 +502 @@
     """Initialize the module as appropriate for OS/2"""
     g = {}
+    # load the installed Makefile:
+    try:
+        filename = get_makefile_filename()
+        parse_makefile(filename, g)
+    except IOError, msg:
+        my_msg = "invalid Python installation: unable to open %s" % filename
+        if hasattr(msg, "strerror"):
+            my_msg = my_msg + " (%s)" % msg.strerror
+
+        raise DistutilsPlatformError(my_msg)
+
+    # load the installed pyconfig.h:
+    try:
+        filename = get_config_h_filename()
+        parse_config_h(file(filename), g)
+    except IOError, msg:
+        my_msg = "invalid Python installation: unable to open %s" % filename
+        if hasattr(msg, "strerror"):
+            my_msg = my_msg + " (%s)" % msg.strerror
+
+        raise DistutilsPlatformError(my_msg)
+
+    # On AIX, there are wrong paths to the linker scripts in the Makefile
+    # -- these paths are relative to the Python source, but when installed
+    # the scripts are in another directory.
+    if python_build:
+        g['LDSHARED'] = g['BLDSHARED']
+
+    # OS/2 module
+
     # set basic install directories
     g['LIBDEST'] = get_python_lib(plat_specific=0, standard_lib=1)

python/trunk/Lib/distutils/unixccompiler.py

@@ -140 +140 @@
     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" or sys.platform == "os2knix":
         exe_extension = ".exe"
 
@@ -284 +284 @@
         # we use this hack.
         compiler = os.path.basename(sysconfig.get_config_var("CC"))
-        if sys.platform[:6] == "darwin":
+        if sys.platform[:6] == "darwin" or sys.platform[:7] == "os2knix":
             # MacOSX's linker doesn't understand the -R flag at all
             return "-L" + dir