win ninja: include .pdb in linker outputs

pylib/gyp/generator/ninja.py

 # Copyright (c) 2013 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 hashlib
 import json
 import multiprocessing
 import os.path
 import re
@@ skipping 1082 matching lines @@
     if command in ('solink', 'solink_module'):
       extra_bindings.append(('soname', os.path.split(output)[1]))
       extra_bindings.append(('lib',
                             gyp.common.EncodePOSIXShellArgument(output)))
       if self.flavor == 'win':
         extra_bindings.append(('dll', output))
         if '/NOENTRY' not in ldflags:
           self.target.import_lib = output + '.lib'
           extra_bindings.append(('implibflag',
                                  '/IMPLIB:%s' % self.target.import_lib))
+          pdbname = self.msvs_settings.GetPDBName(
+              config_name, self.ExpandSpecial, output + '.pdb')
           output = [output, self.target.import_lib]
+          if pdbname:
+            output.append(pdbname)
       elif not self.is_mac_bundle:
         output = [output, output + '.TOC']
       else:
         command = command + '_notoc'
+    elif self.flavor == 'win':
+      extra_bindings.append(('exe', output))
+      pdbname = self.msvs_settings.GetPDBName(

[Nico, 2014/01/08 21:44:13]

# Must match /PDB: flag in the 'link' rule.

[scottmg, 2014/01/08 21:54:57]

It's confusing, but it actually doesn't have to. The link rule sets some name,
and then GetPDBName as used by GetLdflags overrides it with its own setting for
/PDB.

...

Hm, actually, maybe I should just remove it entirely from the rule. I'll look
into that.

+          config_name, self.ExpandSpecial, output + '.pdb')

[Nico, 2014/01/08 21:44:13]

default=output + '.pdb'

[scottmg, 2014/01/08 21:54:57]

Done. (and above)

+      if pdbname:
+        output = [output, pdbname]
+
 
     if len(solibs):
       extra_bindings.append(('solibs', gyp.common.EncodePOSIXShellList(solibs)))
 
     ninja_file.build(output, command + command_suffix, link_deps,
                      implicit=list(implicit_deps),
                      variables=extra_bindings)
     return linked_binary
 
   def WriteTarget(self, spec, config_name, config, link_deps, compile_deps):
@@ skipping 484 matching lines @@
                     rspfile_content='$libs $in_newline $ldflags',
                     restat=True,
                     pool='link_pool')
   master_ninja.rule('solink_module' + rule_name_suffix,
                     description=dlldesc, command=dllcmd,
                     rspfile='$dll.rsp',
                     rspfile_content='$libs $in_newline $ldflags',
                     restat=True,
                     pool='link_pool')
   # Note that ldflags goes at the end so that it has the option of
   # overriding default settings earlier in the command line.

[Nico, 2014/01/08 21:44:13]

# The /PDB: argument must match the pdbname written by WriteLinkForArch.

   exe_cmd = ('%s gyp-win-tool link-wrapper $arch '
-             '$ld /nologo /OUT:$out /PDB:$out.pdb @$out.rsp' %
+             '$ld /nologo /OUT:$exe /PDB:$exe.pdb @$exe.rsp' %
               sys.executable)
-  exe_cmd = FullLinkCommand(exe_cmd, '$out', 'exe')
+  exe_cmd = FullLinkCommand(exe_cmd, '$exe', 'exe')
   master_ninja.rule('link' + rule_name_suffix,
-                    description='LINK%s $out' % rule_name_suffix.upper(),
+                    description='LINK%s $exe' % rule_name_suffix.upper(),
                     command=exe_cmd,
-                    rspfile='$out.rsp',
+                    rspfile='$exe.rsp',
                     rspfile_content='$in_newline $libs $ldflags',
                     pool='link_pool')
 
 
 def GenerateOutputForConfig(target_list, target_dicts, data, params,
                             config_name):
   options = params['options']
   flavor = gyp.common.GetFlavor(params)
   generator_flags = params.get('generator_flags', {})
 
@@ skipping 478 matching lines @@
   if gyp.common.GetFlavor(params) == 'win':
     target_list, target_dicts = MSVSUtil.ShardTargets(target_list, target_dicts)
     target_list, target_dicts = MSVSUtil.InsertLargePdbShims(
         target_list, target_dicts, generator_default_variables)
 
   if user_config:
     GenerateOutputForConfig(target_list, target_dicts, data, params,
                             user_config)
   else:
     config_names = target_dicts[target_list[0]]['configurations'].keys()
-    if params['parallel']:
+    if False: #params['parallel']:

[Nico, 2014/01/08 21:44:13]

I assume you don't mean to land this part :-)

[scottmg, 2014/01/08 21:54:57]

Ahem. I need to look into why the stack traces are wrong in parallel in the
generator. :/

       try:
         pool = multiprocessing.Pool(len(config_names))
         arglists = []
         for config_name in config_names:
           arglists.append(
               (target_list, target_dicts, data, params, config_name))
         pool.map(CallGenerateOutputForConfig, arglists)
       except KeyboardInterrupt, e:
         pool.terminate()
         raise e
     else:
       for config_name in config_names:
         GenerateOutputForConfig(target_list, target_dicts, data, params,
                                 config_name)