Get ninja working for nacl.

pylib/gyp/generator/ninja.py

 # 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
 import gyp.common
 import gyp.msvs_emulation
 import gyp.MSVSVersion
 import gyp.system_test
@@ skipping 327 matching lines @@
     config = spec['configurations'][config_name]
     self.target = Target(spec['type'])
 
     self.is_mac_bundle = gyp.xcode_emulation.IsMacBundle(self.flavor, spec)
     self.xcode_settings = self.msvs_settings = None
     if self.flavor == 'mac':
       self.xcode_settings = gyp.xcode_emulation.XcodeSettings(spec)
     if self.flavor == 'win':
       self.msvs_settings = gyp.msvs_emulation.MsvsSettings(spec,
                                                            generator_flags)
-      # TODO(scottmg): x64 support.
-      self.ninja.variable('arch', self.win_env['x86'])
+      target_platform = self.msvs_settings.GetTargetPlatform(config_name)
+      self.ninja.variable('arch', self.win_env[target_platform])
 
     # Compute predepends for all rules.
     # actions_depends is the dependencies this target depends on before running
     # any of its action/rule/copy steps.
     # compile_depends is the dependencies this target depends on before running
     # any of its compile steps.
     actions_depends = []
     compile_depends = []
     # TODO(evan): it is rather confusing which things are lists and which
     # are strings.  Fix these.
@@ skipping 383 matching lines @@
                                                  cflags_objcc))
     self.ninja.newline()
     outputs = []
     for source in sources:
       filename, ext = os.path.splitext(source)
       ext = ext[1:]
       obj_ext = self.obj_ext
       if ext in ('cc', 'cpp', 'cxx'):
         command = 'cxx'
       elif ext == 'c' or (ext in ('s', 'S') and self.flavor != 'win'):
-        # TODO(scottmg): .s files won't be handled by the Windows compiler.
-        # We could add support for .asm, though that's only supported on
-        # x86. Currently not used in Chromium in favor of other third-party
-        # assemblers.
         command = 'cc'
+      elif (self.flavor == 'win' and ext == 'asm' and
+            self.msvs_settings.GetTargetPlatform(config_name) == 'Win32'):
+        # Asm files only get auto assembled for x86 (not x64).

[scottmg, 2012/06/27 23:08:11]

Is that a TODO? Or does VS actually not run ml64 automatically for .asm in x64
projects?

[bradn, 2012/06/28 01:37:51]

Frighteningly it doesn't run it.

+        command = 'asm'
+        obj_ext = '_asm.obj'

[scottmg, 2012/06/27 23:08:11]

is there a reason to add _asm to the name?

[bradn, 2012/06/28 01:37:51]

There's one instance in the code base in which there's actually a .cc and a .asm
with the same name. Apparently whatever msvs is doing to build it allows both to
end up being compiled and linked, so I've added a suffix to avoid collisions.
(Unless they name it _asm).
Adding a comment.

       elif self.flavor == 'mac' and ext == 'm':
         command = 'objc'
       elif self.flavor == 'mac' and ext == 'mm':
         command = 'objcxx'
       elif self.flavor == 'win' and ext == 'rc':
         command = 'rc'
         obj_ext = '.res'
       else:
         # Ignore unhandled extensions.
         continue
@@ skipping 491 matching lines @@
   flock = 'flock'
   if flavor == 'mac':
     flock = './gyp-mac-tool flock'
   master_ninja.variable('cc', os.environ.get('CC', cc))
   master_ninja.variable('cxx', os.environ.get('CXX', cxx))
   if flavor == 'win':
     master_ninja.variable('ld', 'link.exe')
     master_ninja.variable('idl', 'midl.exe')
     master_ninja.variable('ar', 'lib.exe')
     master_ninja.variable('rc', 'rc.exe')
+    master_ninja.variable('asm', 'ml.exe')
   else:
     master_ninja.variable('ld', flock + ' linker.lock $cxx')
     master_ninja.variable('ar', os.environ.get('AR', 'ar'))
 
   master_ninja.variable('ar_target', os.environ.get('AR_target', '$ar'))
   master_ninja.variable('cc_target', os.environ.get('CC_target', '$cc'))
   master_ninja.variable('cxx_target', os.environ.get('CXX_target', '$cxx'))
   if flavor == 'win':
     master_ninja.variable('ld_target', os.environ.get('LD_target', '$ld'))
   else:
@@ skipping 67 matching lines @@
       command=('%s gyp-win-tool midl-wrapper $arch $outdir '
                '$tlb $h $dlldata $iid $proxy $in '
                '$idlflags' % sys.executable))
     master_ninja.rule(
       'rc',
       description='RC $in',
       # Note: $in must be last otherwise rc.exe complains.
       command=('%s gyp-win-tool rc-wrapper '
                '$arch $rc $defines $includes $rcflags /fo$out $in' %
                sys.executable))
+    master_ninja.rule(
+      'asm',
+      description='ASM $in',
+      command=('%s gyp-win-tool asm-wrapper '
+               '$arch $asm $defines $includes /c /Fo $out $in' %
+               sys.executable))
 
   if flavor != 'mac' and flavor != 'win':
     master_ninja.rule(
       'alink',
       description='AR $out',
       command='rm -f $out && $ar rcsT $out $in')
     master_ninja.rule(
       'solink',
       description='SOLINK $out',
       command=('$ld -shared $ldflags -o $out -Wl,-soname=$soname '
@@ skipping 179 matching lines @@
 
   user_config = params.get('generator_flags', {}).get('config', None)
   if user_config:
     GenerateOutputForConfig(target_list, target_dicts, data, params,
                             user_config)
   else:
     config_names = target_dicts[target_list[0]]['configurations'].keys()
     for config_name in config_names:
       GenerateOutputForConfig(target_list, target_dicts, data, params,
                               config_name)