Add exe servers to the list of binaries that may be packaged with the mini_in...

chrome/tools/build/win/scan_server_dlls.py

 #!/usr/bin/python
 # Copyright (c) 2006-2008 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 used to scan for server DLLs at build time and build a header
    included by setup.exe. This header contains an array of the names of
    the DLLs that need registering at install time.
 
 """
@@ skipping 46 matching lines @@
   """
   output_file = os.path.join(header_output_dir, GENERATED_DLL_INCLUDE_FILE_NAME)
 
   dll_array_string = ""
   for dll in registered_dll_list:
     dll.replace("\\", "\\\\")
     if dll_array_string:
       dll_array_string += ', '
     dll_array_string += "L\"%s\"" % dll
 
-  f = open(output_file, 'w')
+  if len(registered_dll_list) == 0:
+    contents = GENERATED_DLL_INCLUDE_FILE_CONTENTS % ("L\"\"", 0)
+  else:
+    contents = GENERATED_DLL_INCLUDE_FILE_CONTENTS % (dll_array_string,
+                                                      len(registered_dll_list))
+
+  # Don't rewrite the header file if we don't need to.
   try:
-    if len(registered_dll_list) == 0:
-      f.write(GENERATED_DLL_INCLUDE_FILE_CONTENTS % ("L\"\"", 0))
-    else:
-      f.write(GENERATED_DLL_INCLUDE_FILE_CONTENTS % (dll_array_string,
-                                                     len(registered_dll_list)))
-  finally:
-    f.close()
+    old_file = open(output_file, 'r')
+  except EnvironmentError:
+    old_contents = None
+  else:
+    old_contents = old_file.read()
+

[kuchhal, 2009/09/10 17:08:23]

old_file.close() here somewhere

[robertshield, 2009/09/10 17:30:46]

Added, thanks!

+  if contents != old_contents:
+    print 'Updating server dll header: ' + str(output_file)
+    open(output_file, 'w').write(contents)
 
 
 def ScanServerDlls(config, distribution, output_dir):
   """Scans for DLLs in the specified section of config that are in the
   subdirectory of output_dir named SERVERS_DIR. Returns a list of only the
   filename components of the paths to all matching DLLs.
   """
 
+  print "Scanning for server DLLs in " + output_dir
+
   registered_dll_list = []
   ScanDllsInSection(config, 'GENERAL', output_dir, registered_dll_list)
   if distribution:
     if len(distribution) > 1 and distribution[0] == '_':
       distribution = distribution[1:]
     ScanDllsInSection(config, distribution.upper(), output_dir,
                       registered_dll_list)
 
   return registered_dll_list
 
 
 def ScanDllsInSection(config, section, output_dir, registered_dll_list):
   """Scans for DLLs in the specified section of config that are in the
   subdirectory of output_dir named SERVERS_DIR. Appends the file name of all
   matching dlls to registered_dll_list.
   """
   for option in config.options(section):
     if option.endswith('dir'):
       continue
 
     dst = config.get(section, option)
     (x, src_folder) = os.path.split(dst)
 
     for file in glob.glob(os.path.join(output_dir, option)):
       if option.startswith(SERVERS_DIR):
         (x, file_name) = os.path.split(file)
-        print "Found server DLL file: " + file_name
-        registered_dll_list.append(file_name)
+        if file_name.lower().endswith('.dll'):
+          print "Found server DLL file: " + file_name
+          registered_dll_list.append(file_name)
 
 
 def RunSystemCommand(cmd):
   if (os.system(cmd) != 0):
     raise "Error while running cmd: %s" % cmd
 
 
 def main(options):
   """Main method that reads input file, scans <build_output>\servers for
      matches to files described in the input file. A header file for the
@@ skipping 10 matching lines @@
   option_parser = optparse.OptionParser()
   option_parser.add_option('-o', '--output_dir', help='Build Output directory')
   option_parser.add_option('-x', '--header_output_dir',
       help='Location where the generated header file will be placed.')
   option_parser.add_option('-i', '--input_file', help='Input file')
   option_parser.add_option('-d', '--distribution',
       help='Name of Chromium Distribution. Optional.')
 
   options, args = option_parser.parse_args()
   sys.exit(main(options))