[pywin32-checkins] pywin32 setup.py,1.108,1.109

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13960

Modified Files:
	setup.py 
Log Message:
fix build issues with 3.1, and build 214

Index: setup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup.py,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -d -r1.108 -r1.109
*** setup.py	18 Jun 2009 10:22:58 -0000	1.108
--- setup.py	8 Jul 2009 02:13:00 -0000	1.109
***************
*** 1,3 ****
! build_id="213.1" # may optionally include a ".{patchno}" suffix.
  # Putting buildno at the top prevents automatic __doc__ assignment, and
  # I *want* the build number at the top :)
--- 1,3 ----
! build_id="214" # may optionally include a ".{patchno}" suffix.
  # Putting buildno at the top prevents automatic __doc__ assignment, and
  # I *want* the build number at the top :)
***************
*** 1121,1128 ****
--- 1121,1141 ----
          extra_dll = self.debug and "_d.dll" or ".dll"
          extra_exe = self.debug and "_d.exe" or ".exe"
+         # *sob* - python fixed this bug in python 3.1 (bug 6403)
+         # So in the fixed versions we only get the base name, and if the
+         # output name is simply 'dir\name' we need to nothing.
+ 
+         # The pre 3.1 pywintypes
          if name == "pywin32_system32.pywintypes":
              return r"pywin32_system32\pywintypes%d%d%s" % (sys.version_info[0], sys.version_info[1], extra_dll)
+         # 3.1+ pywintypes
+         elif name == "pywintypes":
+             return r"pywintypes%d%d%s" % (sys.version_info[0], sys.version_info[1], extra_dll)
+         # pre 3.1 pythoncom
          elif name == "pywin32_system32.pythoncom":
              return r"pywin32_system32\pythoncom%d%d%s" % (sys.version_info[0], sys.version_info[1], extra_dll)
+         # 3.1+ pythoncom
+         elif name == "pythoncom":
+             return r"pythoncom%d%d%s" % (sys.version_info[0], sys.version_info[1], extra_dll)
+         # Pre 3.1 rest.
          elif name.endswith("win32.perfmondata"):
              return r"win32\perfmondata" + extra_dll
***************
*** 1133,1136 ****
--- 1146,1155 ----
          elif name.endswith("isapi.PyISAPI_loader"):
              return r"isapi\PyISAPI_loader" + extra_dll
+         # The post 3.1 rest
+         elif name in ['perfmondata', 'PyISAPI_loader']:
+             return name + extra_dll
+         elif name in ['pythonservice', 'Pythonwin']:
+             return name + extra_exe
+ 
          return build_ext.get_ext_filename(self, name)