[Chromoting] Build Chromoting Host installation in two steps: (binaries & .wxs) -> .zip -> .msi.

remoting/host/installer/build-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.
 
 """Creates a zip archive for the Chrome Remote Desktop Host installer.
 
 This script builds a zip file that contains all the files needed to build an
 installer for Chrome Remote Desktop Host.
 
@@ skipping 84 matching lines @@
     dst_root: Target directory where files are copied.
     src_roots: Array of path prefixes which will be stripped of |src_file|
                (if they match) before appending it to the |dst_root|.
     src_file: Source file to be copied.
   Returns:
     Full path to destination file in |dst_root|.
   """
   # Strip of directory prefix.
   found_root = False
   for root in src_roots:
-    if src_file.startswith(root):
-      src_file = src_file[len(root):]
+    root = os.path.normpath(root)
+    src_file = os.path.normpath(src_file)
+    if os.path.commonprefix([root, src_file]) == root:
+      src_file = os.path.relpath(src_file, root)
       found_root = True
       break
 
   if not found_root:
     error('Unable to match prefix for %s' % src_file)
 
   dst_file = os.path.join(dst_root, src_file)
   # Make sure target directory exists.
   dst_dir = os.path.dirname(dst_file)
   if not os.path.exists(dst_dir):
@@ skipping 66 matching lines @@
     defs: Dictionary of variable definitions.
   """
   cleanDir(temp_dir)
 
   for f in source_files:
     dst_file = remapSrcFile(temp_dir, source_file_roots, f)
     base_file = os.path.basename(f)
     (base, ext) = os.path.splitext(f)
     if ext == '.zip':
       copyZipIntoArchive(temp_dir, source_file_roots, f)
-    elif ext in ['.packproj', '.pkgproj', '.plist', '.props', '.sh']:
+    elif ext in ['.packproj', '.pkgproj', '.plist', '.props', '.sh', '.json']:
       copyFileWithDefs(f, dst_file, defs)
     else:
       shutil.copy2(f, dst_file)
 
   for bs, bd in zip(gen_files, gen_files_dst):
     dst_file = os.path.join(temp_dir, bd)
+    if not os.path.exists(os.path.dirname(dst_file)):
+      os.makedirs(os.path.dirname(dst_file))
     if os.path.isdir(bs):
       shutil.copytree(bs, dst_file)
     else:
       shutil.copy2(bs, dst_file)
 
   createZip(zip_path, temp_dir)
 
 
 def error(msg):
   sys.stderr.write('ERROR: %s\n' % msg)
@@ skipping 49 matching lines @@
     elif arg_mode == 'defs':
       definitions.append(arg)
     else:
       usage()
       error('Expected --source-files')
 
   # Make sure at least one file was specified.
   if len(source_files) == 0 and len(generated_files) == 0:
     error('At least one input file must be specified.')
 
-  # Ensure that each path in source_file_roots ends with a directory separator.
-  for root in source_file_roots:
-    if root[-1:] != os.sep:
-      error('Each source-file-root should end with a "\": %s' % root)
-
   # Sort roots to ensure the longest one is first. See comment in remapSrcFile
   # for why this is necessary.
+  source_file_roots = map(os.path.normpath, source_file_roots)
   source_file_roots.sort(key=len, reverse=True)
 
   # Verify that the 2 generated_files arrays have the same number of elements.
   if len(generated_files) != len(generated_files_dst):
     error('len(--generated-files) != len(--generated-files-dst)')
 
   defs = buildDefDictionary(definitions)
 
   result = buildHostArchive(temp_dir, zip_path, source_file_roots,
                             source_files, generated_files, generated_files_dst,
                             defs)
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())