[Python-checkins] r52979 - in python/branches/release22-maint/Lib/distutils: command/install.py dist.py sysconfig.py

[andrew.kuchling]

Author: andrew.kuchling
Date: Sun Dec 10 01:35:20 2006
New Revision: 52979

Modified:
   python/branches/release22-maint/Lib/distutils/command/install.py
   python/branches/release22-maint/Lib/distutils/dist.py
   python/branches/release22-maint/Lib/distutils/sysconfig.py
Log:
[Jython patch #1578658] Make distutils work for Jython, at least for 
pure-Python distributions.

Patch by Supreet Sethi, slightly modified by adding the change
to sysconfig.py.


Modified: python/branches/release22-maint/Lib/distutils/command/install.py
==============================================================================
--- python/branches/release22-maint/Lib/distutils/command/install.py	(original)
+++ python/branches/release22-maint/Lib/distutils/command/install.py	Sun Dec 10 01:35:20 2006
@@ -55,7 +55,14 @@
         'headers': '$base/Include/$dist_name',
         'scripts': '$base/Scripts',
         'data'   : '$base',
-        }
+        },
+    'java': {
+        'purelib': '$base/Lib',
+        'platlib': '$base/Lib',
+        'headers': '$base/Include/$dist_name',
+        'scripts': '$base/Scripts',
+        'data'   : '$base',
+        },
     }
 
 # The keys to an installation scheme; if any new types of files are to be

Modified: python/branches/release22-maint/Lib/distutils/dist.py
==============================================================================
--- python/branches/release22-maint/Lib/distutils/dist.py	(original)
+++ python/branches/release22-maint/Lib/distutils/dist.py	Sun Dec 10 01:35:20 2006
@@ -130,7 +130,8 @@
         self.metadata = DistributionMetadata()
         for basename in self.metadata._METHOD_BASENAMES:
             method_name = "get_" + basename
-            setattr(self, method_name, getattr(self.metadata, method_name))
+            if hasattr(self.metadata, method_name):
+                setattr(self, method_name, getattr(self.metadata, method_name))
 
         # 'cmdclass' maps command names to class objects, so we
         # can 1) quickly figure out which class to instantiate when

Modified: python/branches/release22-maint/Lib/distutils/sysconfig.py
==============================================================================
--- python/branches/release22-maint/Lib/distutils/sysconfig.py	(original)
+++ python/branches/release22-maint/Lib/distutils/sysconfig.py	Sun Dec 10 01:35:20 2006
@@ -119,6 +119,11 @@
                 return os.path.join(prefix, "Lib")
             else:
                 return os.path.join(prefix, "Lib", "site-packages")
+    elif os.name == "java":
+        if standard_lib:
+            return os.path.join(prefix, "Lib")
+        else:
+            return os.path.join(prefix, "Lib", "site-packages")
     else:
         raise DistutilsPlatformError(
             "I don't know where Python installs its library "