Add options for host/target OS/arch.

pylib/gyp/__init__.py

 #!/usr/bin/env python
 
 # Copyright (c) 2012 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import copy
 import gyp.input
 import optparse
 import os.path
@@ skipping 51 matching lines @@
   flavor = None
   if '-' in format:
     format, params['flavor'] = format.split('-', 1)
 
   default_variables = copy.copy(default_variables)
 
   # Default variables provided by this program and its modules should be
   # named WITH_CAPITAL_LETTERS to provide a distinct "best practice" namespace,
   # avoiding collisions with user and automatic variables.
   default_variables['GENERATOR'] = format
+  default_variables['HOST_OS'] = options.host_os
+  default_variables['TARGET_OS'] = options.target_os

[Torne, 2013/03/11 16:16:50]

Currently there is a variable OS that's set by some (but not all) generators to
the flavor; for compatibility with existing gyp files we probably want to set OS
to options.target_os, but I won't do that until I've replaced all the existing
uses of flavor inside gyp.

+  default_variables['HOST_ARCH'] = options.host_arch
+  default_variables['TARGET_ARCH'] = options.target_arch

[Nico, 2013/07/05 21:50:50]

On Mac (and iOS), targets can have multiple target archs (via ARCHS). I think
that's possible to model with the current #target / #host stuff, but won't be
possible with this.

 
   # Format can be a custom python file, or by default the name of a module
   # within gyp.generator.
   if format.endswith('.py'):
     generator_name = os.path.splitext(format)[0]
     path, generator_name = os.path.split(generator_name)
 
     # Make sure the path to the custom generator is in sys.path
     # Don't worry about removing it once we are done.  Keeping the path
     # to each generator that is used in sys.path is likely harmless and
@@ skipping 244 matching lines @@
   # --no-circular-check disables the check for circular relationships between
   # .gyp files.  These relationships should not exist, but they've only been
   # observed to be harmful with the Xcode generator.  Chromium's .gyp files
   # currently have some circular relationships on non-Mac platforms, so this
   # option allows the strict behavior to be used on Macs and the lenient
   # behavior to be used elsewhere.
   # TODO(mark): Remove this option when http://crbug.com/35878 is fixed.
   parser.add_option('--no-circular-check', dest='circular_check',
                     action='store_false', default=True, regenerate=False,
                     help="don't check for circular relationships between files")
+  parser.add_option('--host-os', dest='host_os', action='store', default=None,
+                    metavar='OS', env_name='GYP_HOST_OS',
+                    help='override detected host OS')
+  parser.add_option('--target-os', dest='target_os', action='store',
+                    default=None, metavar='OS', env_name='GYP_TARGET_OS',
+                    help='crosscompile for a different target OS')
+  parser.add_option('--host-arch', dest='host_arch', action='store',
+                    default=None, metavar='ARCH', env_name='GYP_HOST_ARCH',
+                    help='override detected host architecture')
+  parser.add_option('--target-arch', dest='target_arch', action='store',
+                    default=None, metavar='ARCH', env_name='GYP_TARGET_ARCH',
+                    help='crosscompile for a different target architecture')
 
   # We read a few things from ~/.gyp, so set up a var for that.
   home_vars = ['HOME']
   if sys.platform in ('cygwin', 'win32'):
     home_vars.append('USERPROFILE')
   home = None
   home_dot_gyp = None
   for home_var in home_vars:
     home = os.getenv(home_var)
     if home != None:
@@ skipping 28 matching lines @@
 
   if not options.generator_output and options.use_environment:
     g_o = os.environ.get('GYP_GENERATOR_OUTPUT')
     if g_o:
       options.generator_output = g_o
 
   if not options.parallel and options.use_environment:
     p = os.environ.get('GYP_PARALLEL')
     options.parallel = bool(p and p != '0')
 
+  if not options.host_os:
+    if options.use_environment:
+      options.host_os = os.environ.get('GYP_HOST_OS')
+    if not options.host_os:
+      options.host_os = gyp.common.GetFlavor({})
+
+  if not options.target_os:
+    if options.use_environment:
+      options.target_os = os.environ.get('GYP_TARGET_OS')
+    if not options.target_os:
+      options.target_os = options.host_os
+
+  if not options.host_arch:
+    if options.use_environment:
+      options.host_arch = os.environ.get('GYP_HOST_ARCH')
+    if not options.host_arch:
+      options.host_arch = gyp.common.DetectHostArchitecture()
+
+  if not options.target_arch:
+    if options.use_environment:
+      options.target_arch = arch.environ.get('GYP_TARGET_ARCH')
+    if not options.target_arch:
+      options.target_arch = options.host_arch
+
   for mode in options.debug:
     gyp.debug[mode] = 1
 
   # Do an extra check to avoid work when we're not debugging.
   if DEBUG_GENERAL in gyp.debug:
     DebugOutput(DEBUG_GENERAL, 'running with these options:')
     for option, value in sorted(options.__dict__.items()):
       if option[0] == '_':
         continue
       if isinstance(value, basestring):
@@ skipping 129 matching lines @@
 
 def main(args):
   try:
     return gyp_main(args)
   except GypError, e:
     sys.stderr.write("gyp: %s\n" % e)
     return 1
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))