Fix for running buildbot script with 32-bit python under WOW64

visual_studio/NativeClientVSAddIn/InstallerResources/install.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Copies necessary add-in files into place to install the add-in.
 
 This script will copy the necessary files for the Visual Studio add-in
 to where Visual Studio can find them. It assumes the current directory
 contains the necessary files to copy.
 """
 
 import create_ppapi_platform
 import ctypes
 import os
 import optparse
 import platform
 import shutil
 import sys
 import time
 
 NACL_PLATFORM_NAME = 'NaCl'
 PEPPER_PLATFORM_NAME = 'PPAPI'
 
 DEFAULT_VS_USER_DIRECTORY = os.path.expandvars(
     '%USERPROFILE%\\My Documents\\Visual Studio 2010')
 
-DEFAULT_MS_BUILD_DIRECTORY = os.path.expandvars('%ProgramFiles(x86)%\\MSBuild')
-
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 
 ADDIN_FILES = ['NativeClientVSAddIn.AddIn', 'NativeClientVSAddIn.dll']
 
 class InstallError(Exception):
   """Error class for this installer indicating a fatal but expected error."""
   pass
 
 def UninstallDirectory(directory):
   if os.path.exists(directory):
@@ skipping 28 matching lines @@
     answer = raw_input().strip().lower()
     if answer in ('y', 'yes'):
       return True
     if answer in ('n', 'no'):
       return False
 
 
 def main():
   parser = optparse.OptionParser(usage='Usage: %prog [options]')
   parser.add_option('-b', '--msbuild-path', dest='msbuild_path',
-      default=DEFAULT_MS_BUILD_DIRECTORY, metavar='PATH',
-      help='Provide the path to the MSBuild directory')
+      metavar='PATH', help='Provide the path to the MSBuild directory')
   parser.add_option('-a', '--vsuser-path', dest='vsuser_path',
       default=DEFAULT_VS_USER_DIRECTORY, metavar='PATH',
       help='Provide the path to the Visual Studio user directory')
   parser.add_option('-f', '--force', action="store_true",
       default=False, help='Force an overwrite of existing files')
   parser.add_option('-p', '--ppapi', action="store_true", dest='install_ppapi',
       help='Install PPAPI template without asking.')
   parser.add_option('-n', '--no-ppapi', action="store_false",
       dest='install_ppapi', help='Do not install PPAPI template and do not ask')
   parser.add_option('-u', '--uninstall', action="store_true",
       dest='uninstall', help='Remove the add-in.')
   (options, args) = parser.parse_args()
 
   print "*************************************************"
   print "Native-Client Visual Studio 2010 Add-in Installer"
   print "*************************************************\n"
 
   if platform.system() != 'Windows':
     raise InstallError('Must install to Windows system')
 
+  if not options.msbuild_path:
+    # Find the x86 program files folder.  If we are uing a 64-bit version of
+    # python.exe then ProgramFiles(x86).  If we using a 32-bit python then
+    # ProgramFiles will always be set to point the x86 program files even
+    # under W0W64.
+    if 'ProgramFiles(x86)' in os.environ:
+      options.msbuild_path = os.path.expandvars('%ProgramFiles(x86)%\\MSBuild')
+    else:
+      options.msbuild_path = os.path.expandvars('%ProgramFiles%\\MSBuild')
+
+
   if CheckForRunningProgams():
     if not options.force:
       print "Visual Studio and MSBuild must be closed during installation"
       if not Ask("Kill all instances now?"):
         raise InstallError('Please close all Visual Studio or MSBuild '
                            'instances before installing')
     os.system("taskkill.exe /IM MSBuild.exe /f")
     os.system("taskkill.exe /IM devenv.exe")
     if CheckForRunningProgams():
       for i in xrange(10):
@@ skipping 117 matching lines @@
   except shutil.Error as e:
     print "Error while copying file. Please ensure file is not in use."
     print e
   except WindowsError as e:
     if e.winerror == 5:
       print "Access denied error.  Please ensure Visual Studio and MSBuild"
       print "processes are closed."
     else:
       raise
   sys.exit(rtn)