Change how MB handles goma_dir.

tools/mb/mb.py

 #!/usr/bin/env python
 # Copyright 2015 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.
 
 """MB - the Meta-Build wrapper around GYP and GN
 
 MB is a wrapper script for GYP and GN that can be used to generate build files
 for sets of canned configurations and analyze them.
 """
@@ skipping 56 matching lines @@
       subp.add_argument('-b', '--builder',
                         help='builder name to look up config from')
       subp.add_argument('-m', '--master',
                         help='master name to look up config from')
       subp.add_argument('-c', '--config',
                         help='configuration to analyze')
       subp.add_argument('-f', '--config-file', metavar='PATH',
                         default=self.default_config,
                         help='path to config file '
                             '(default is //tools/mb/mb_config.pyl)')
-      subp.add_argument('-g', '--goma-dir', default=self.ExpandUser('~/goma'),
-                        help='path to goma directory (default is %(default)s).')
+      subp.add_argument('-g', '--goma-dir',
+                        help='path to goma directory')
       subp.add_argument('-n', '--dryrun', action='store_true',
                         help='Do a dry run (i.e., do nothing, just print '
                              'the commands that will run)')
       subp.add_argument('-v', '--verbose', action='store_true',
                         help='verbose logging')
 
     parser = argparse.ArgumentParser(prog='mb')
     subps = parser.add_subparsers()
 
     subp = subps.add_parser('analyze',
@@ skipping 755 matching lines @@
   def GNCmd(self, subcommand, path, gn_args='', extra_args=None):
     if self.platform == 'linux2':
       subdir, exe = 'linux64', 'gn'
     elif self.platform == 'darwin':
       subdir, exe = 'mac', 'gn'
     else:
       subdir, exe = 'win', 'gn.exe'
     gn_path = self.PathJoin(self.chromium_src_dir, 'buildtools', subdir, exe)
 
     cmd = [gn_path, subcommand, path]
-    gn_args = gn_args.replace("$(goma_dir)", self.args.goma_dir)
+    if self.args.goma_dir:
+      gn_args += ' goma_dir="%s"' % self.args.goma_dir

[Dirk Pranke, 2016/04/12 18:03:20]

Ideally gn_args and gyp_defines would be lists of key=value strings, but in
order 
to get that I'd need to rewrite all of the entries in mb_config.pyl, which I
don't 
want to do as part of this series of patches.

     if gn_args:
       cmd.append('--args=%s' % gn_args)
     if extra_args:
       cmd.extend(extra_args)
     return cmd
 
   def RunGYPGen(self, vals):
     path = self.args.path[0]
 
     output_dir = self.ParseGYPConfigPath(path)
@@ skipping 132 matching lines @@
     output_dir, _, _ = rpath.rpartition(self.sep)
     return output_dir
 
   def GYPCmd(self, output_dir, vals):
     gyp_defines = vals['gyp_defines']
     goma_dir = self.args.goma_dir
 
     # GYP uses shlex.split() to split the gyp defines into separate arguments,
     # so we can support backslashes and and spaces in arguments by quoting
     # them, even on Windows, where this normally wouldn't work.
-    if '\\' in goma_dir or ' ' in goma_dir:
+    if goma_dir and ('\\' in goma_dir or ' ' in goma_dir):
       goma_dir = "'%s'" % goma_dir
-    gyp_defines = gyp_defines.replace("$(goma_dir)", goma_dir)
+
+    if goma_dir:
+      gyp_defines += ' gomadir=%s' % goma_dir
 
     cmd = [
         self.executable,
         self.PathJoin('build', 'gyp_chromium'),
         '-G',
         'output_dir=' + output_dir,
     ]
 
     # Ensure that we have an environment that only contains
     # the exact values of the GYP variables we need.
@@ skipping 331 matching lines @@
   # Then check to see if the arg contains any metacharacters other than
   # double quotes; if it does, quote everything (including the double
   # quotes) for safety.
   if any(a in UNSAFE_FOR_CMD for a in arg):
     arg = ''.join('^' + a if a in ALL_META_CHARS else a for a in arg)
   return arg
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))