Changeset 394 for python

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

Files:

• Doc/library/sysconfig.rst (modified) (1 diff)
• Lib/distutils/command/install.py (modified) (1 diff)
• Lib/distutils/sysconfig.py (modified) (1 diff)
• Lib/distutils/tests/test_install.py (modified) (1 diff)
• Lib/site.py (modified) (1 diff)
• Lib/sysconfig.py (modified) (3 diffs)
• Lib/test/test_sysconfig.py (modified) (1 diff)

python/trunk/Doc/library/sysconfig.rst

@@ -84 +84 @@
 - *nt_user*: scheme for NT platforms, when the *user* option is used.
 - *os2*: scheme for OS/2 platforms.
-- *os2_home*: scheme for OS/2 patforms, when the *user* option is used.
+- *os2_user*: scheme for OS/2 patforms, when the *user* option is used.
 
 Each scheme is itself composed of a series of paths and each path has a unique

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)
 

python/trunk/Lib/site.py

@@ -286 +286 @@
         seen.add(prefix)
 
-        if sys.platform in ('os2emx', 'riscos'):
+        if sys.platform in ('riscos'):
             sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
-        elif sys.platform == 'os2knix':
-            sitepackages.append(os.path.join(prefix, "lib",
-                                        "python" + sys.version[:3],
-                                        "site-packages"))
-            sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
-        elif os.sep == '/':
+        elif os.sep == '/' or os.name == 'os2':
             sitepackages.append(os.path.join(prefix, "lib",
                                         "python" + sys.version[:3],
                                         "site-packages"))
             sitepackages.append(os.path.join(prefix, "lib", "site-python"))
+            if os.name == 'os2':
+                sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
         else:
             sitepackages.append(prefix)

python/trunk/Lib/sysconfig.py

@@ -38 +38 @@
         },
     'os2': {
-        'stdlib': '{base}/Lib',
-        'platstdlib': '{base}/Lib',
-        'purelib': '{base}/Lib/site-packages',
-        'platlib': '{base}/Lib/site-packages',
-        'include': '{base}/Include',
-        'platinclude': '{base}/Include',
-        'scripts': '{base}/Scripts',
-        'data'   : '{base}',
-        },
-    'os2_home': {
+        'stdlib': '{base}/lib/python{py_version_short}',
+        'platstdlib': '{platbase}/lib/python{py_version_short}',
+        'purelib': '{base}/lib/python{py_version_short}/site-packages',
+        'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
+        'include': '{base}/include/python{py_version_short}',
+        'platinclude': '{platbase}/include/python{py_version_short}',
+        'scripts': '{base}/bin',
+        'data': '{base}',
+        },
+    'os2_user': {
         'stdlib': '{userbase}/lib/python{py_version_short}',
         'platstdlib': '{userbase}/lib/python{py_version_short}',
@@ -157 +157 @@
 
     for key, value in _INSTALL_SCHEMES[scheme].items():
-        if os.name in ('posix', 'nt'):
+        if os.name in ('posix', 'nt', 'os2'):
             value = os.path.expanduser(value)
         res[key] = os.path.normpath(_subst_vars(value, vars))
@@ -463 +463 @@
         _CONFIG_VARS['projectbase'] = _PROJECT_BASE
 
-        if os.name in ('nt', 'os2'):
+        if os.name == 'nt':
             _init_non_posix(_CONFIG_VARS)
-        if os.name == 'posix':
+        if os.name in ('posix', 'os2'):
             _init_posix(_CONFIG_VARS)
 

python/trunk/Lib/test/test_sysconfig.py

@@ -240 +240 @@
 
     def test_get_scheme_names(self):
-        wanted = ('nt', 'nt_user', 'os2', 'os2_home', 'osx_framework_user',
+        wanted = ('nt', 'nt_user', 'os2', 'os2_user', 'osx_framework_user',
                   'posix_home', 'posix_prefix', 'posix_user')
         self.assertEqual(get_scheme_names(), wanted)