Fix .d for ninja on Windows

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 gyp
 import gyp.common
 import gyp.system_test
 import gyp.xcode_emulation
 import os.path
 import re
@@ skipping 813 matching lines @@
     path = self.ExpandSpecial(generator_default_variables['PRODUCT_DIR'])
     return os.path.join(path, self.xcode_settings.GetExecutablePath())
 
   def ComputeOutputFileName(self, spec, type=None):
     """Compute the filename of the final output for the current target."""
     if not type:
       type = spec['type']
 
     # Compute filename prefix: the product prefix, or a default for
     # the product type.
-    DEFAULT_PREFIX = {
-      'loadable_module': 'lib',
-      'shared_library': 'lib',
-      'static_library': 'lib',
-      }
+    if self.flavor == 'win':

[Nico, 2012/02/16 19:32:26]

This should be !=, or you need to swap the branch bodies.

(This is breaking the linux build with nacl enabled)

+      DEFAULT_PREFIX = {
+        'loadable_module': 'lib',
+        'shared_library': 'lib',
+        'static_library': 'lib',
+        }
+    else:
+      DEFAULT_PREFIX = {
+        'loadable_module': '',
+        'shared_library': '',
+        'static_library': '',
+        }
     prefix = spec.get('product_prefix', DEFAULT_PREFIX.get(type, ''))
 
     # Compute filename extension: the product extension, or a default
     # for the product type.
-    DEFAULT_EXTENSION = {
-      'static_library': 'a',
-      'loadable_module': 'so',
-      'shared_library': 'so',
-      }
+    if self.flavor == 'win':
+      DEFAULT_EXTENSION = {
+        'static_library': 'lib',
+        'loadable_module': 'dll',
+        'shared_library': 'dll',
+        'executable': 'exe',
+        }
+    else:
+      DEFAULT_EXTENSION = {
+        'static_library': 'a',
+        'loadable_module': 'so',
+        'shared_library': 'so',
+        }
     extension = spec.get('product_extension',
                          DEFAULT_EXTENSION.get(type, ''))
     if extension:
       extension = '.' + extension
 
     if 'product_name' in spec:
       # If we were given an explicit name, use that.
       target = spec['product_name']
     else:
       # Otherwise, derive a name from the target name.
@@ skipping 187 matching lines @@
       command=('$cc -MMD -MF $out.d $defines $includes $cflags $cflags_c '
               '$cflags_pch_c -c $in -o $out'),
       depfile='$out.d')
     master_ninja.rule(
       'cxx',
       description='CXX $out',
       command=('$cxx -MMD -MF $out.d $defines $includes $cflags $cflags_cc '
               '$cflags_pch_cc -c $in -o $out'),
       depfile='$out.d')
   else:
-    # TODO(scottmg): Decide how /showIncludes handling should work in ninja.
+    # TODO(scottmg): Requires deplist branch of ninja for now (for
+    # /showIncludes handling).
     master_ninja.rule(
       'cc',
       description='CC $out',
-      command=('$cc /nologo $defines $includes $cflags $cflags_c '
-              '$cflags_pch_c /c $in /Fo$out'),
-      depfile='$out.d')
+      command=('cmd /c $cc /nologo /showIncludes '
+               '$defines $includes $cflags $cflags_c '
+               '$cflags_pch_c /c $in /Fo$out '
+               '| ninja-deplist-helper -f cl -o $out.dl'),
+      deplist='$out.dl')
     master_ninja.rule(
       'cxx',
       description='CXX $out',
-      command=('$cxx /nologo $defines $includes $cflags $cflags_cc '
-              '$cflags_pch_cc /c $in /Fo$out'),
-      depfile='$out.d')
+      command=('cmd /c $cxx /nologo /showIncludes '
+               '$defines $includes $cflags $cflags_cc '
+               '$cflags_pch_cc /c $in /Fo$out '
+               '| ninja-deplist-helper -f cl -o $out.dl'),
+      deplist='$out.dl')
 
   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 '
                '-Wl,--whole-archive $in -Wl,--no-whole-archive $libs'))
     master_ninja.rule(
       'solink_module',
       description='SOLINK(module) $out',
       command=('$ld -shared $ldflags -o $out -Wl,-soname=$soname '
                '-Wl,--start-group $in -Wl,--end-group $libs'))
     master_ninja.rule(
       'link',
       description='LINK $out',
       command=('$ld $ldflags -o $out -Wl,-rpath=\$$ORIGIN/lib '
                '-Wl,--start-group $in -Wl,--end-group $libs'))
   elif flavor == 'win':
     master_ninja.rule(
       'alink',
       description='AR $out',
       command='lib /nologo /OUT:$out.lib $in')
     master_ninja.rule(
       'solink',
       description='SOLINK $out',
-      command=('$ld /nologo /DLL $ldflags /OUT:$out.dll $in $libs'))
+      command=('$ld /nologo /DLL $ldflags /OUT:$out $in $libs'))
     master_ninja.rule(
       'solink_module',
       description='SOLINK(module) $out',
-      command=('$ld /nologo /DLL $ldflags /OUT:$out.dll $in $libs'))
+      command=('$ld /nologo /DLL $ldflags /OUT:$out $in $libs'))
     master_ninja.rule(
       'link',
       description='LINK $out',
-      command=('$ld /nologo $ldflags /OUT:$out.exe $in $libs'))
+      command=('$ld /nologo $ldflags /OUT:$out $in $libs'))
   else:
     master_ninja.rule(
       'objc',
       description='OBJC $out',
       command=('$cc -MMD -MF $out.d $defines $includes $cflags $cflags_objc '
                '$cflags_pch_objc -c $in -o $out'),
       depfile='$out.d')
     master_ninja.rule(
       'objcxx',
       description='OBJCXX $out',
@@ skipping 107 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)