Allow an AppsV2 build to be configured using GYP.

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 38 matching lines @@
   zip = zipfile.ZipFile(zip_path, 'w', zipfile.ZIP_DEFLATED)
   for (root, dirs, files) in os.walk(directory):
     for f in files:
       full_path = os.path.join(root, f)
       rel_path = os.path.relpath(full_path, directory)
       zip.write(full_path, os.path.join(zipfile_base, rel_path))
   zip.close()
 
 
 def buildWebApp(buildtype, version, mimetype, destination, zip_path, plugin,
-                files, locales):
+                patchfile, files, locales):
   """Does the main work of building the webapp directory and zipfile.
 
   Args:
     buildtype: the type of build ("Official" or "Dev")
     mimetype: A string with mimetype of plugin.
     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|.
     plugin: A string with path to the binary plugin for this webapp.
@@ skipping 82 matching lines @@
     if os.path.isdir(plugin):
       # On Mac we have a directory.
       shutil.copytree(plugin, newPluginPath)
     else:
       shutil.copy2(plugin, newPluginPath)
 
   # Strip the linux build.
   if ((platform.system() == 'Linux') and (buildtype == 'Official')):
     subprocess.call(["strip", newPluginPath])
 
+  # Patch the files, if necessary. Do this before updating any placeholders
+  # in case any of the diff contexts refer to the placeholders.
+  if (patchfile != ''):
+    patchfile = os.path.join(os.getcwd(), patchfile)
+    if subprocess.call(['patch', '-d', destination, '-i', patchfile,
+                        '-p1']) != 0:
+      return 1
+
   # Set the version number in the manifest version.
   findAndReplace(os.path.join(destination, 'manifest.json'),
                  'FULL_APP_VERSION',
                  version)
 
   # Set the correct mimetype.
   findAndReplace(os.path.join(destination, 'plugin_settings.js'),
                  'HOST_PLUGIN_MIMETYPE',
                  mimetype)
 
@@ skipping 23 matching lines @@
   findAndReplace(os.path.join(destination, 'plugin_settings.js'),
                  "'API_CLIENT_ID'",
                  "'" + apiClientId + "'")
   findAndReplace(os.path.join(destination, 'plugin_settings.js'),
                  "'API_CLIENT_SECRET'",
                  "'" + apiClientSecret + "'")
 
   # Make the zipfile.
   createZip(zip_path, destination)
 
+  return 0
+
 
 def main():
   if len(sys.argv) < 7:
     print ('Usage: build-webapp.py '
            '<build-type> <version> <mime-type> <dst> <zip-path> <plugin> '
-           '<other files...> --locales <locales...>')
+           '<patch> <other files...> --locales <locales...>')

[Wez, 2013/01/15 02:24:31]

nit: Would be cleaner to add --patches akin to --locales...

[Jamie, 2013/01/15 21:57:01]

Much cleaner, thanks. Done.

     return 1
 
   reading_locales = False
   files = []
   locales = []
-  for arg in sys.argv[7:]:
+  for arg in sys.argv[8:]:
     if arg == "--locales":
       reading_locales = True;
     elif reading_locales:
       locales.append(arg)
     else:
       files.append(arg)
 
-  buildWebApp(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5],
-              sys.argv[6], files, locales)
-  return 0
+  return buildWebApp(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4],
+                     sys.argv[5], sys.argv[6], sys.argv[7], files, locales)
 
 
 if __name__ == '__main__':
   sys.exit(main())