Adding cross-compile ability to the make build

pylib/gyp/generator/msvs.py

 #!/usr/bin/python
 
 import os
 import re
 import subprocess
 import sys
 
 import gyp.MSVSNew as MSVSNew
 import gyp.MSVSProject as MSVSProject
 import gyp.MSVSToolFile as MSVSToolFile
@@ skipping 913 matching lines @@
     return node
   for child in node.keys():
     node[child] = _CollapseSingles(child, node[child])
   return node
 
 
 def _GatherSolutionFolders(project_objs):
   root = {}
   # Convert into a tree of dicts on path.
   for p in project_objs.keys():
-    gyp_file, target = gyp.common.BuildFileAndTarget('', p)[0:2]
+    gyp_file, target = gyp.common.ParseQualifiedTarget(p)[0:2]
     gyp_dir = os.path.dirname(gyp_file)
     path_dict = _GetPathDict(root, gyp_dir)
     path_dict[target + '.vcproj'] = project_objs[p]
   # Walk down from the top until we hit a folder that has more than one entry.
   # In practice, this strips the top-level "src/" dir from the hierarchy in
   # the solution.
   while len(root) == 1 and type(root[root.keys()[0]]) == dict:
     root = root[root.keys()[0]]
   # Collapse singles.
   root = _CollapseSingles('', root)
@@ skipping 66 matching lines @@
   options = params['options']
   generator_flags = params.get('generator_flags', {})
 
   # Get the project file format version back out of where we stashed it in
   # GeneratorCalculatedVariables.
   msvs_version = params['msvs_version']
 
   # Prepare the set of configurations.
   configs = set()
   for qualified_target in target_list:
-    build_file = gyp.common.BuildFileAndTarget('', qualified_target)[0]
+    build_file = gyp.common.BuildFile(qualified_target)
     spec = target_dicts[qualified_target]
     for config_name, c in spec['configurations'].iteritems():
       configs.add('|'.join([config_name,
                             c.get('configuration_platform', 'Win32')]))
   configs = list(configs)
 
   # Generate each project.
   projects = {}
   for qualified_target in target_list:
-    build_file = gyp.common.BuildFileAndTarget('', qualified_target)[0]
+    build_file = gyp.common.BuildFile(qualified_target)
     spec = target_dicts[qualified_target]
+    if spec['toolset'] != 'target':
+      raise Exception(
+          'Multiple toolsets not supported in msvs build (target %s)' %
+          qualified_target)
     default_config = spec['configurations'][spec['default_configuration']]
     vcproj_filename = default_config.get('msvs_existing_vcproj')
     if not vcproj_filename:
       vcproj_filename = spec['target_name'] + options.suffix + '.vcproj'
     vcproj_path = os.path.join(os.path.split(build_file)[0], vcproj_filename)
     if options.generator_output:
       projectDirPath = os.path.dirname(os.path.abspath(vcproj_path))
       vcproj_path = os.path.join(options.generator_output, vcproj_path)
       fixpath_prefix = gyp.common.RelativePath(projectDirPath,
                                                os.path.dirname(vcproj_path))
@@ skipping 23 matching lines @@
       _ProjectObject(sln_path, p, project_objs, projects)
     # Create folder hierarchy.
     root_entries = _GatherSolutionFolders(project_objs)
     # Create solution.
     sln = MSVSNew.MSVSSolution(sln_path,
                                entries=root_entries,
                                variants=configs,
                                websiteProperties=False,
                                version=msvs_version)
     sln.Write()