Changeset 394 for python/trunk/Lib/distutils

Timestamp:

Mar 21, 2014, 1:39:52 PM (11 years ago)

Author:

dmik

Message:

python: Use Posix directory scheme everywhere on OS/2.

Location:

python/trunk/Lib/distutils

Files:

• command/install.py (modified) (1 diff)
• sysconfig.py (modified) (1 diff)
• tests/test_install.py (modified) (1 diff)

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

@@ -71 +71 @@
         },
     'os2': {
-        'purelib': '$base/Lib/site-packages',
-        'platlib': '$base/Lib/site-packages',
-        'headers': '$base/Include/$dist_name',
-        'scripts': '$base/Scripts',
+        'purelib': '$base/lib/python$py_version_short/site-packages',
+        'platlib': '$platbase/lib/python$py_version_short/site-packages',
+        'headers': '$base/include/python$py_version_short/$dist_name',
+        'scripts': '$base/bin',
         'data'   : '$base',
         },
-    'os2_home': {
+    'os2_user': {
         'purelib': '$usersite',
         'platlib': '$usersite',

python/trunk/Lib/distutils/sysconfig.py

@@ -433 +433 @@
 def _init_os2():
     """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)
-    g['BINLIBDEST'] = get_python_lib(plat_specific=1, standard_lib=1)
-
-    # XXX hmmm.. a normal install puts include files here
-    g['INCLUDEPY'] = get_python_inc(plat_specific=0)
-
-    g['SO'] = '.pyd'
-    g['EXE'] = ".exe"
-
-    global _config_vars
-    _config_vars = g
+    _init_posix()
+    # set the python module extension to .pyd instead of .dll -
+    # for compatibility with previous releases
+    _config_vars['SO'] = '.pyd'
 
 

python/trunk/Lib/distutils/tests/test_install.py

@@ -96 +96 @@
         self.addCleanup(cleanup)
 
-        for key in ('nt_user', 'unix_user', 'os2_home'):
+        for key in ('nt_user', 'unix_user', 'os2_user'):
             self.assertIn(key, INSTALL_SCHEMES)