Allow an AppsV2 build to be configured using GYP.

remoting/remoting.gyp

 # 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.
 
 {
   'variables': {
     # TODO(dmaclach): can we pick this up some other way? Right now it's
     # duplicated from chrome.gyp
     'chromium_code': 1,
 
     'variables': {
       'conditions': [
         # Enable the multi-process host on Windows by default.
         ['OS=="win"', {
           'remoting_multi_process%': 1,
         }, {
           'remoting_multi_process%': 0,
         }],
       ],
     },
 
     'remoting_host_linux_clipboard%': 1,
     'remoting_multi_process%': '<(remoting_multi_process)',
+    'remoting_webapp_apps_v2%': 0,

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

nit: remoting_use_apps_v2 or remoting_app_v2_webapp (and then
remoting_apps_v2_files)

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

Done.

 
     # The |major|, |build| and |patch| versions are inherited from Chrome.
     # Since Chrome's |minor| version is always '0', we replace it with a
     # Chromoting-specific patch version.
     # Note that we check both the |chrome_version_path| file and the
     # |remoting_version_path| so that we can override the Chrome version
     # numbers if needed.
     'version_py_path': '../chrome/tools/build/version.py',
     'remoting_version_path': '../remoting/VERSION',
     'chrome_version_path': '../chrome/VERSION',
@@ skipping 1664 matching lines @@
       'target_name': 'remoting_webapp',
       'type': 'none',
       'dependencies': [
         'remoting_resources',
         'remoting_host_plugin',
       ],
       'sources': [
         'webapp/build-webapp.py',
         '<(remoting_version_path)',
         '<(chrome_version_path)',
+        '<(remoting_webapp_patch_file)',
         '<@(remoting_webapp_files)',
         '<@(remoting_webapp_js_files)',
+        '<@(remoting_webapp_apps_v2_js_files)',

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

Rather than add these here and set them empty for v1, just add them directly to
e.g. remoting_webapp_js_files, e.g:

['remoting_webapp_apps_v2==1', {
'remoting_webapp_js_files': [
  'webapp/background.js',
  'webapp/identity.js',
 ]
]
 
and let GYP merge them with the rest.

Since we don't do anything special w/ the patch file at this level, you could
add it to remoting_webapp_files in a similar manner, to get the necessary
dependency.

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

I tried that, but the list is replaced, not merged. I think this approach is
fine for a temporary fix.

         '<@(remoting_webapp_locale_files)',
       ],
 
       'conditions': [
         ['enable_remoting_host==1', {
           'variables': {
               'plugin_path': '<(PRODUCT_DIR)/<(host_plugin_prefix)remoting_host_plugin.<(host_plugin_extension)',
           },
         }, {
           'variables': {
               'plugin_path': '',
           },
           'dependencies!': [
             'remoting_host_plugin',
           ],
         }],
+        ['remoting_webapp_apps_v2==1', {
+          'variables': {
+            'remoting_webapp_patch_file': 'webapp/appsv2.patch',
+            'remoting_webapp_apps_v2_js_files': [
+              'webapp/background.js',
+              'webapp/identity.js',
+            ],
+          },
+        }, {
+          'variables': {
+            'remoting_webapp_patch_file': '',
+            'remoting_webapp_apps_v2_js_files': [],
+          },
+        }],
       ],
 
       # Can't use a 'copies' because we need to manipulate
       # the manifest file to get the right plugin name.
       # Also we need to move the plugin into the me2mom
       # folder, which means 2 copies, and gyp doesn't
       # seem to guarantee the ordering of 2 copies statements
       # when the actual project is generated.
       'actions': [
         {
           'action_name': 'Build Remoting WebApp',
           'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp',
           'zip_path': '<(PRODUCT_DIR)/remoting-webapp.zip',
           'inputs': [
             'webapp/build-webapp.py',
             '<(remoting_version_path)',
             '<(chrome_version_path)',
+            '<(remoting_webapp_patch_file)',
             '<@(remoting_webapp_files)',
             '<@(remoting_webapp_js_files)',
+            '<@(remoting_webapp_apps_v2_js_files)',
             '<@(remoting_webapp_locale_files)',
           ],
           'conditions': [
             ['enable_remoting_host==1', {
               'inputs': [
                 '<(plugin_path)',
               ],
             }],
           ],
           'outputs': [
             '<(_output_dir)',
             '<(_zip_path)',
           ],
           'action': [
             'python', 'webapp/build-webapp.py',
             '<(buildtype)',
             '<(version_full)',
             '<(host_plugin_mime_type)',
             '<(_output_dir)',
             '<(_zip_path)',
             '<(plugin_path)',
+            '<(remoting_webapp_patch_file)',
             '<@(remoting_webapp_files)',
             '<@(remoting_webapp_js_files)',
+            '<@(remoting_webapp_apps_v2_js_files)',
             '--locales',
             '<@(remoting_webapp_locale_files)',
           ],
           'msvs_cygwin_shell': 1,
         },
       ],
     }, # end of target 'remoting_webapp'
 
     {
       'target_name': 'remoting_resources',
@@ skipping 605 matching lines @@
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
         }],  # end of 'toolkit_uses_gtk == 1'
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }