[Chromoting] Update build-webapp to accept a filelist & update GN rules

remoting/webapp/build-webapp.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 directory with with the unpacked contents of the remoting webapp.
 
 The directory will contain a copy-of or a link-to to all remoting webapp
 resources.  This includes HTML/JS and any plugin binaries. The script also
 massages resulting files appropriately with host plugin data. Finally,
@@ skipping 91 matching lines @@
   (template_path, template_name) = os.path.split(input_file)
   include_paths = [template_path] + include_paths
   env = jinja2.Environment(loader=jinja2.FileSystemLoader(include_paths))
   template = env.get_template(template_name)
   rendered = template.render(context)
   io.open(output_file, 'w', encoding='utf-8').write(rendered)
 
 def buildWebApp(buildtype, version, destination, zip_path,
                 manifest_template, webapp_type, appid, app_client_id, app_name,
                 app_description, app_capabilities, manifest_key, files,
-                locales_listfile, jinja_paths, service_environment, use_gcd):
+                files_listfile, locales_listfile, jinja_paths,
+                service_environment, use_gcd):
   """Does the main work of building the webapp directory and zipfile.
 
   Args:
     buildtype: the type of build ("Official", "Release" or "Dev").
     destination: A string with path to directory where the webapp will be
                  written.
     zipfile: A string with path to the zipfile to create containing the
              contents of |destination|.
     manifest_template: jinja2 template file for manifest.
     webapp_type: webapp type ("v1", "v2", "v2_pnacl" or "app_remoting").
     appid: A string with the Remoting Application Id (only used for app
              remoting webapps). If supplied, it defaults to using the
              test API server.
     app_client_id: The OAuth2 client ID for the webapp.
     app_name: A string with the name of the application.
     app_description: A string with the description of the application.
     app_capabilities: A set of strings naming the capabilities that should be
                       enabled for this application.
     manifest_key: The manifest key for the webapp.
     files: An array of strings listing the paths for resources to include
            in this webapp.
+    files_listfile: The name of a file containing a list of files, one per
+            line, identifying the resources to include in this webapp. This

[Jamie, 2015/04/24 23:51:49]

Nit: Indentation.

[garykac, 2015/04/27 15:36:16]

Done.

+             is an alternate to specifying the files directly via the 'files'
+             option. The files listed in this file are appended to the files
+             passed via the 'files' option, if any.
     locales_listfile: The name of a file containing a list of locales, one per
              line, which are copied, along with their directory structure, from
              the _locales directory down.
     jinja_paths: An array of paths to search for {%include} directives in
                  addition to the directory containing the manifest template.
     service_environment: Used to point the webapp to one of the
                          dev/test/staging/prod/prod-testing environments
     use_gcd: True if GCD support should be enabled.
   """
 
   # Load the locales files from the locales_listfile.
   if not locales_listfile:
     raise Exception('You must specify a locales_listfile')
   locales = []
   with open(locales_listfile) as input:
     for s in input:
       locales.append(s.rstrip())
 
+  # Load the files from the files_listfile.
+  if files_listfile:
+    with open(files_listfile) as input:
+      for s in input:
+        files.append(s.rstrip())
+
   # Ensure a fresh directory.
   try:
     shutil.rmtree(destination)
   except OSError:
     if os.path.exists(destination):
       raise
     else:
       pass
   os.mkdir(destination, 0775)
 
@@ skipping 268 matching lines @@
   parser.add_argument('manifest_template')
   parser.add_argument('webapp_type')
   parser.add_argument('files', nargs='*', metavar='file', default=[])
   parser.add_argument('--app_name', metavar='NAME')
   parser.add_argument('--app_description', metavar='TEXT')
   parser.add_argument('--app_capabilities',
                       nargs='*', default=[], metavar='CAPABILITY')
   parser.add_argument('--appid')
   parser.add_argument('--app_client_id', default='')
   parser.add_argument('--manifest_key', default='')
+  parser.add_argument('--files_listfile', default='', metavar='PATH')
   parser.add_argument('--locales_listfile', default='', metavar='PATH')
   parser.add_argument('--jinja_paths', nargs='*', default=[], metavar='PATH')
   parser.add_argument('--service_environment', default='', metavar='ENV')
   parser.add_argument('--use_gcd', choices=['0', '1'], default='0')
 
   args = parser.parse_args()
   args.use_gcd = (args.use_gcd != '0')
   args.app_capabilities = set(args.app_capabilities)
   return buildWebApp(**vars(args))
 
 
 if __name__ == '__main__':
   sys.exit(main())