[pywin32-checkins] pywin32/win32/scripts regsetup.py,1.18,1.19

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

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

Modified Files:
	regsetup.py 
Log Message:
Fix locating PCBuild dir on 64bit builds

Index: regsetup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/scripts/regsetup.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** regsetup.py	4 Dec 2008 03:38:20 -0000	1.18
--- regsetup.py	27 Jan 2009 06:25:57 -0000	1.19
***************
*** 113,117 ****
      found = os.path.join(sys.prefix,  possibleRealNames)
      if not FileExists(found): # for developers
!         found = os.path.join(sys.prefix,  "PCBuild", possibleRealNames)
      if not FileExists(found):
          found = LocateFileName(possibleRealNames, searchPaths)
--- 113,120 ----
      found = os.path.join(sys.prefix,  possibleRealNames)
      if not FileExists(found): # for developers
!         if "64 bit" in sys.version:
!             found = os.path.join(sys.prefix,  "PCBuild", "amd64", possibleRealNames)
!         else:
!             found = os.path.join(sys.prefix,  "PCBuild", possibleRealNames)
      if not FileExists(found):
          found = LocateFileName(possibleRealNames, searchPaths)
***************
*** 342,345 ****
--- 345,350 ----
      # value
      check = os.path.join(sys.prefix, "PCBuild")
+     if "64 bit" in sys.version:
+         check = os.path.join(check, "amd64")
      if os.path.isdir(check):
          regutil.RegisterNamedPath("PCBuild",check)
***************
*** 458,462 ****
          searchPath.append("..\\..\\lib")
          searchPath.append("..\\build")
!         searchPath.append("..\\..\\pcbuild")
  
          print "Attempting to setup/repair the Python core"
--- 463,470 ----
          searchPath.append("..\\..\\lib")
          searchPath.append("..\\build")
!         if "64 bit" in sys.version:
!             searchPath.append("..\\..\\pcbuild\\amd64")
!         else:
!             searchPath.append("..\\..\\pcbuild")
  
          print "Attempting to setup/repair the Python core"