Fix create_installer_archive.py to be more flexible with output directory names

chrome/tools/build/win/create_installer_archive.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.
 
 """Script to create Chrome Installer archive.
 
   This script is used to create an archive of all the files required for a
   Chrome install in appropriate directory structure. It reads chrome.release
   file as input, creates chrome.7z archive, compresses setup.exe and
@@ skipping 335 matching lines @@
   modified_manifest_file = open(
       os.path.join(output_dir, manifest_name), 'w')
   modified_manifest_file.write(''.join(manifest_lines))
   modified_manifest_file.close()
 
 
 # Copy the relevant CRT DLLs to |build_dir|. We copy DLLs from all versions
 # of VS installed to make sure we have the correct CRT version, unused DLLs
 # should not conflict with the others anyways.
 def CopyVisualStudioRuntimeDLLs(build_dir):
-  is_debug = os.path.basename(build_dir) == 'Debug'
-  if not is_debug and os.path.basename(build_dir) != 'Release':
+  is_debug = os.path.basename(build_dir).startswith('Debug')
+  if not is_debug and not os.path.basename(build_dir).startswith('Release'):
     print ("Warning: could not determine build configuration from "
            "output directory, assuming Release build.")
 
   crt_dlls = []
   if is_debug:
     crt_dlls = glob.glob(
         "C:/Program Files (x86)/Microsoft Visual Studio */VC/redist/"
         "Debug_NonRedist/x86/Microsoft.*.DebugCRT/*.dll")

[grt (UTC plus 2), 2013/02/26 02:29:13]

should "x86" here be "x64" for a 64-bit build?

   else:
     crt_dlls = glob.glob(
         "C:/Program Files (x86)/Microsoft Visual Studio */VC/redist/x86/"

[grt (UTC plus 2), 2013/02/26 02:29:13]

same here (but only the 2nd x86)

         "Microsoft.*.CRT/*.dll")
 
   # Also handle the case where someone is building using only winsdk and
   # doesn't have Visual Studio installed.
   if not crt_dlls:
     # On a 64-bit system, 32-bit dlls are in SysWOW64 (don't ask).
     if os.access("C:/Windows/SysWOW64", os.F_OK):
       sys_dll_dir = "C:/Windows/SysWOW64"
     else:
       sys_dll_dir = "C:/Windows/System32"
@@ skipping 215 matching lines @@
   if not options.resource_file_path:
     options.resource_file_path = os.path.join(options.build_dir,
                                               MINI_INSTALLER_INPUT_FILE)
 
   return options
 
 
 if '__main__' == __name__:
   print sys.argv
   sys.exit(main(_ParseOptions()))