Allow an AppsV2 build to be configured using GYP.

remoting/remoting.gyp

Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 26eb6fc5e4f28fceb77c200c5213fca1a6d22584..55c9474bec5814ed06957849f8cc2217aa05fce0 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -21,6 +21,7 @@
 
     '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
@@ -1705,8 +1706,10 @@
         '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)',
       ],
 
@@ -1723,6 +1726,20 @@
             '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
@@ -1740,8 +1757,10 @@
             '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': [
@@ -1763,8 +1782,10 @@
             '<(_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)',
           ],