Add fnl build target

mojo/tools/mojob.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 """A simple script to make building/testing Mojo components easier."""
 
 import argparse
 from copy import deepcopy
 import logging
@@ skipping 13 matching lines @@
 _verbose_count = 0
 
 
 def _args_to_config(args):
   # Default to host OS.
   target_os = None
   if args.android:
     target_os = Config.OS_ANDROID
   elif args.ios:
     target_os = Config.OS_IOS
+  elif args.fnl:
+    target_os = Config.OS_FNL
 
   target_cpu = args.target_cpu
 
   additional_args = {}
 
   if 'clang' in args:
     additional_args['is_clang'] = args.clang
 
   if 'asan' in args and args.asan:
     additional_args['sanitizer'] = Config.SANITIZER_ASAN
@@ skipping 37 matching lines @@
   if 'master_name' in args:
     additional_args['master_name'] = args.master_name
   if 'test_results_server' in args:
     additional_args['test_results_server'] = args.test_results_server
 
   if 'gn_args' in args:
     additional_args['gn_args'] = args.gn_args
 
   is_debug = args.debug and not args.official
 
+  if args.target_sysroot != None:

[viettrungluu, 2015/09/15 23:48:22]

nit: |'target_sysroot' in args|

Or maybe |'target_sysroot' in args and args.target_sysroot|.

(I don't know if it'll store None or the empty string, but if you need to
distinguish between the two, it should be |... and args.target_sysroot is not
None|.)

[cdotstout, 2015/09/16 22:01:00]

Done.

+    additional_args['target_sysroot'] = os.path.join(Paths().src_root,

[viettrungluu, 2015/09/15 23:48:23]

Hmmm, this implies that target_sysroot is relative to src_root.

Probably you should specify that in the description of the argument, though it
seems awkward that you then can't specify an absolute path.

Possibly more natural would be to resolve it against the current directory
(using os.path.abspath or whatever).

[cdotstout, 2015/09/16 22:01:00]

Done.

+        args.target_sysroot)
+
+  if target_os == Config.OS_FNL:

[viettrungluu, 2015/09/15 23:48:23]

I'm not a fan of having exits in random functions, so it'd probably be better to
have a check like the |if args.simulator and not args.ios:| check in main().

(You probably also don't want to allow target_sysroot for non-FNL.)

[cdotstout, 2015/09/16 22:01:00]

Done.

[viettrungluu, 2015/09/16 22:19:46]

You didn't add a check in main(). You can if you want....

[cdotstout, 2015/09/16 22:27:09]

I didn't put it in main() because doing so forces you to provide
target_sysroot/toolchain_prefix when doing 'build' as well as 'gn', but it's
only needed at the 'gn' step.  (Maybe I can detect gn vs build in main(), I
spent 2 mins trying then gave up).

The build system complains if you don't provide what's needed, so I didn't
bother adding a check at the script level.

+    if 'target_sysroot' not in additional_args:
+      print "Must specify target_sysroot for FNL"
+      sys.exit(1)
+
   return Config(target_os=target_os, target_cpu=target_cpu,
                 is_debug=is_debug, is_official_build=args.official,
                 dcheck_always_on=args.dcheck_always_on,
                 is_simulator=args.simulator, **additional_args)
 
 
 def _get_out_dir(config):
   """Gets the build output directory (e.g., out/Debug), relative to src, for the
   given config."""
 
@@ skipping 136 matching lines @@
   # The official build is a release build suitable for distribution, with a
   # different package name.
   debug_group.add_argument('--official', help='Official build', default=False,
                            dest='official', action='store_true')
 
   os_group = parent_parser.add_mutually_exclusive_group()
   os_group.add_argument('--android', help='Build for Android',
                         action='store_true')
   os_group.add_argument('--ios', help='Build for iOS',
                         action='store_true')
+  os_group.add_argument('--fnl', help='Build for FNL',
+                        action='store_true')
 
   parent_parser.add_argument('--simulator',
                              help='Build for a simulator of the target',
                              action='store_true')
 
   parent_parser.add_argument('--target-cpu',
                              help='CPU architecture to build for.',
                              choices=['x64', 'x86', 'arm'])
 
+  parent_parser.add_argument('--target-sysroot',
+                             help='Location of sysroot for target',
+                             dest='target_sysroot')
+
   subparsers = parser.add_subparsers()
 
   sync_parser = subparsers.add_parser('sync', parents=[parent_parser],
       help='Sync using gclient (does not run gn).')
   sync_parser.set_defaults(func=_sync)
 
   gn_parser = subparsers.add_parser('gn', parents=[parent_parser],
                                     help='Run gn for mojo (does not sync).')
   gn_parser.set_defaults(func=_gn)
   gn_parser.add_argument('--args', help='Specify extra args',
@@ skipping 35 matching lines @@
 
   pytest_parser = subparsers.add_parser('pytest', parents=[parent_parser],
       help='Run Python unit tests (does not build).')
   pytest_parser.set_defaults(func=_pytest)
 
   args = parser.parse_args()
   global _verbose_count
   _verbose_count = args.verbose_count
   InitLogging(_verbose_count)
 
   if args.simulator and not args.ios:

[viettrungluu, 2015/09/16 22:19:46]

Similar to this one.

[cdotstout, 2015/09/16 22:27:09]

Acknowledged.

     sys.exit("Currently, the simulator target is only configured for iOS")
 
   return args.func(_args_to_config(args))
 
 
 if __name__ == '__main__':
   sys.exit(main())