[Python-checkins] r51963 - sandbox/trunk/setuptools/setuptools/command/__init__.py sandbox/trunk/setuptools/setuptools/command/bdist_wininst.py

[phillip.eby]

Author: phillip.eby
Date: Fri Sep 22 00:13:40 2006
New Revision: 51963

Added:
   sandbox/trunk/setuptools/setuptools/command/bdist_wininst.py   (contents, props changed)
Modified:
   sandbox/trunk/setuptools/setuptools/command/__init__.py
Log:
Fix bdist_wininst files not being uploaded by "upload"


Modified: sandbox/trunk/setuptools/setuptools/command/__init__.py
==============================================================================
--- sandbox/trunk/setuptools/setuptools/command/__init__.py	(original)
+++ sandbox/trunk/setuptools/setuptools/command/__init__.py	Fri Sep 22 00:13:40 2006
@@ -2,13 +2,14 @@
     'alias', 'bdist_egg', 'bdist_rpm', 'build_ext', 'build_py', 'develop',
     'easy_install', 'egg_info', 'install', 'install_lib', 'rotate', 'saveopts',
     'sdist', 'setopt', 'test', 'upload', 'install_egg_info', 'install_scripts',
-    'register',
+    'register', 'bdist_wininst',
 ]
 
 import sys
 if sys.version>='2.5':
     # In Python 2.5 and above, distutils includes its own upload command
     __all__.remove('upload')
+    __all__.remove('bdist_wininst')  # this is only for 'upload' support
 
 
 from distutils.command.bdist import bdist

Added: sandbox/trunk/setuptools/setuptools/command/bdist_wininst.py
==============================================================================
--- (empty file)
+++ sandbox/trunk/setuptools/setuptools/command/bdist_wininst.py	Fri Sep 22 00:13:40 2006
@@ -0,0 +1,22 @@
+from distutils.command.bdist_wininst import bdist_wininst as _bdist_wininst
+import sys
+
+class bdist_wininst(_bdist_wininst):
+
+    def create_exe(self, arcname, fullname, bitmap=None):
+
+        _bdist_wininst.create_exe(self, arcname, fullname, bitmap)
+
+        if self.target_version:
+            installer_name = os.path.join(self.dist_dir,
+                                          "%s.win32-py%s.exe" %
+                                           (fullname, self.target_version))
+            pyversion = self.target_version
+        else:
+            installer_name = os.path.join(self.dist_dir,
+                                          "%s.win32.exe" % fullname)
+            pyversion = 'any'
+
+        getattr(self.distribution,'dist_files',[]).append(
+            ('bdist_wininst', pyversion, installer_name)
+        )