mb: Allow overriding the path to the gyp script

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 66 matching lines @@
       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',
                         help='path to goma directory')
+      subp.add_argument('--gyp-script',

[Michael Achenbach, 2016/06/03 07:36:38]

FYI: I didn't specify a default here to keep the tests happy. PathJoin is not
mocked yet when this is called.

[Dirk Pranke, 2016/06/03 17:59:24]

I don't quite understand this comment; PathJoin() should already be defined on
the object (both here and in the subclass)? 

However, alternatively, you could define a .default_gyp_script in the __init__()
method just like there's a default_config.

It's not all that important either way, though.

[Michael Achenbach, 2016/06/03 19:55:03]

That's what I tried. PathJoin was not defined in the init method. And setting
default_gyp_script with path.join there made the test fail on windows.

Probably it's defined in ParseArgs. I could just call it there to calculate the
default on the fly without setting it in a field.

+                        help='path to gyp script relative to project root '
+                             '(default is build/gyp_chromium)')
       subp.add_argument('--android-version-code',
                         help='Sets GN arg android_default_version_code and '
                              'GYP_DEFINE app_manifest_version_code')
       subp.add_argument('--android-version-name',
                         help='Sets GN arg android_default_version_name and '
                              'GYP_DEFINE app_manifest_version_name')
       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',
@@ skipping 1001 matching lines @@
     android_version_code = self.args.android_version_code
     if android_version_code:
       gyp_defines += ' app_manifest_version_code=%s' % android_version_code
 
     android_version_name = self.args.android_version_name
     if android_version_name:
       gyp_defines += ' app_manifest_version_name=%s' % android_version_name
 
     cmd = [
         self.executable,
-        self.PathJoin('build', 'gyp_chromium'),
+        self.args.gyp_script or 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.
     env = os.environ.copy()
 
     # This is a terrible hack to work around the fact that
     # //tools/clang/scripts/update.py is invoked by GYP and GN but
@@ skipping 347 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:]))