Merged revisions 71413 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71413 | tarek.ziade | 2009-04-09 23:36:44 +0200 (Thu, 09 Apr 2009) | 1 line

  Fixed #5731: Distutils bdist_wininst no longer worked on non-Windows platforms
........
This commit is contained in:
Tarek Ziadé 2009-04-09 22:02:39 +00:00
parent be3a821b81
commit a619180354
3 changed files with 40 additions and 3 deletions

View file

@ -330,9 +330,14 @@ class bdist_wininst(Command):
directory = os.path.dirname(__file__)
# we must use a wininst-x.y.exe built with the same C compiler
# used for python. XXX What about mingw, borland, and so on?
if self.plat_name == 'win32':
sfix = ''
# if plat_name starts with "win" but is not "win32"
# we want to strip "win" and leave the rest (e.g. -amd64)
# for all other cases, we don't want any suffix
if self.plat_name != 'win32' and self.plat_name[:3] == 'win':
sfix = self.plat_name[3:]
else:
sfix = self.plat_name[3:] # strip 'win' - leaves eg '-amd64'
sfix = ''
filename = os.path.join(directory, "wininst-%.1f%s.exe" % (bv, sfix))
return open(filename, "rb").read()