Change --variable argument, must now be spaced, -V foo bar, instead o…

…f -V foo=bar.

Otherwise, path quoting gets in the way on windows in a way that is very hard to
fix, as the 'bar' value could have double-quote in it, resulting in something like foo="bar".

R=nsylvain@chromium.org
R=mark@chromium.org
R=rsleevi@chromium.org
BUG=
TEST=


Review URL: http://codereview.chromium.org/10139020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133398 0039d316-1c4b-4281-b951-d872f2087c98

base/base.gyp

@@ -485,8 +485,8 @@
             'python',
             '../tools/isolate/isolate.py',
             '--mode', '<(tests_run)',
-            '--variable', 'PRODUCT_DIR=<(PRODUCT_DIR)',
-            '--variable', 'OS=<(OS)',
+            '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
+            '--variable', 'OS', '<(OS)',
             '--result', '<@(_outputs)',
             'base_unittests.isolate',
           ],

net/net.gyp

@@ -1385,8 +1385,8 @@
             'python',
             '../tools/isolate/isolate.py',
             '--mode', '<(tests_run)',
-            '--variable', 'PRODUCT_DIR=<(PRODUCT_DIR)',
-            '--variable', 'OS=<(OS)',
+            '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
+            '--variable', 'OS', '<(OS)',
             '--result', '<@(_outputs)',
             'net_unittests.isolate',
           ],

third_party/cacheinvalidation/README.chromium

@@ -10,4 +10,4 @@ Description:
 This is the API to talk to the Google Cache Invalidation service.
 
 Local Modifications:
-None.
+None

third_party/cacheinvalidation/cacheinvalidation.gyp

@@ -232,9 +232,9 @@
             'python',
             '../../tools/isolate/isolate.py',
             '--mode', '<(tests_run)',
-            '--variable', 'DEPTH=<(DEPTH)',
-            '--variable', 'PRODUCT_DIR=<(PRODUCT_DIR)',
-            '--variable', 'OS=<(OS)',
+            '--variable', 'DEPTH', '<(DEPTH)',
+            '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
+            '--variable', 'OS', '<(OS)',
             '--result', '<@(_outputs)',
             'cacheinvalidation_unittests.isolate',
           ],

tools/isolate/isolate.py

@@ -418,11 +418,11 @@ def get_valid_modes():
 
 
 def main():
-  default_variables = ['OS=%s' % trace_inputs.get_flavor()]
+  default_variables = [('OS', trace_inputs.get_flavor())]
   if sys.platform in ('win32', 'cygwin'):
-    default_variables.append('EXECUTABLE_SUFFIX=.exe')
+    default_variables.append(('EXECUTABLE_SUFFIX', '.exe'))
   else:
-    default_variables.append('EXECUTABLE_SUFFIX=')
+    default_variables.append(('EXECUTABLE_SUFFIX', ''))
   valid_modes = get_valid_modes()
   parser = optparse.OptionParser(
       usage='%prog [options] [.isolate file]',
@@ -443,10 +443,11 @@ def main():
       help='Result file to store the json manifest')
   parser.add_option(
       '-V', '--variable',
+      nargs=2,
       action='append',
       default=default_variables,
       dest='variables',
-      metavar='FOO=BAR',
+      metavar='FOO BAR',
       help='Variables to process in the .isolate file, default: %default')
   parser.add_option(
       '-o', '--outdir', metavar='DIR',
@@ -470,7 +471,7 @@ def main():
   isolate_dir = os.path.dirname(input_file)
 
   # Extract the variables.
-  variables = dict(i.split('=', 1) for i in options.variables)
+  variables = dict(options.variables)
   # Process path variables as a special case. First normalize it, verifies it
   # exists, convert it to an absolute path, then set it as relative to
   # isolate_dir.

tools/isolate/isolate_smoke_test.py

@@ -270,7 +270,7 @@ def test_touch_root(self):
     self._expected_result(['touch_root.py'], None)
 
   def test_with_flag(self):
-    self._execute('check', 'with_flag.isolate', ['-V', 'FLAG=gyp'], False)
+    self._execute('check', 'with_flag.isolate', ['-V', 'FLAG', 'gyp'], False)
     self._expect_no_tree()
     self._expected_result(['with_flag.py', 'gyp'], None)
 
@@ -317,7 +317,8 @@ def test_touch_root(self):
     self._expected_result(['touch_root.py'], None)
 
   def test_with_flag(self):
-    self._execute('hashtable', 'with_flag.isolate', ['-V', 'FLAG=gyp'], False)
+    self._execute(
+        'hashtable', 'with_flag.isolate', ['-V', 'FLAG', 'gyp'], False)
     self._expected_hash_tree()
     self._expected_result(['with_flag.py', 'gyp'], None)
 
@@ -359,7 +360,7 @@ def test_touch_root(self):
     self._expected_result(['touch_root.py'], None)
 
   def test_with_flag(self):
-    self._execute('remap', 'with_flag.isolate', ['-V', 'FLAG=gyp'], False)
+    self._execute('remap', 'with_flag.isolate', ['-V', 'FLAG', 'gyp'], False)
     self._expected_tree()
     self._expected_result(['with_flag.py', 'gyp'], None)
 
@@ -412,7 +413,7 @@ def test_touch_root(self):
     self._expected_result(['touch_root.py'], None)
 
   def test_with_flag(self):
-    self._execute('run', 'with_flag.isolate', ['-V', 'FLAG=run'], False)
+    self._execute('run', 'with_flag.isolate', ['-V', 'FLAG', 'run'], False)
     # Not sure about the empty tree, should be deleted.
     self._expect_empty_tree()
     self._expected_result(['with_flag.py', 'run'], None)
@@ -493,7 +494,7 @@ def test_touch_root(self):
 
   def test_with_flag(self):
     out = self._execute(
-        'trace', 'with_flag.isolate', ['-V', 'FLAG=trace'], True)
+        'trace', 'with_flag.isolate', ['-V', 'FLAG', 'trace'], True)
     self._expect_no_tree()
     self._expected_result(['with_flag.py', 'trace'], None)
     expected = {