Verify the existence of source files in VS2008. Missing source files are now treated as errors.

pylib/gyp/generator/msvs.py

 #!/usr/bin/python
 
 # Copyright (c) 2011 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 ntpath
 import os
 import posixpath
@@ skipping 860 matching lines @@
   # Add rules.
   actions_to_add = {}
   _GenerateRulesForMSVS(p, gyp_dir, options, spec,
                         sources, excluded_sources,
                         actions_to_add)
   sources, excluded_sources, excluded_idl = (
       _AdjustSourcesAndConvertToFilterHierarchy(
           spec, options, gyp_dir, sources, excluded_sources))
 
   # Add in files.
+  _VerifySourcesExist(sources, gyp_dir)
   p.AddFiles(sources)
 
   _AddToolFilesToMSVS(p, spec)
   _HandlePreCompileHeaderStubs(p, spec)
   _AddActions(actions_to_add, spec, relative_path_of_gyp_file)
   _AddCopies(actions_to_add, spec)
   _WriteMSVSUserFile(project.path, version, spec)
 
   # NOTE: this stanza must appear after all actions have been decided.
   # Don't excluded sources with actions attached, or they won't run.
@@ skipping 1708 matching lines @@
       char = ' '
     else:
       char = ';'
     formatted_value = char.join(
         [MSVSSettings.ConvertVCMacrosToMSBuild(i) for i in value])
   else:
     formatted_value = MSVSSettings.ConvertVCMacrosToMSBuild(value)
   return formatted_value
 
 
-def _GetMSBuildSources(spec, root_dir, sources, exclusions,
-                       extension_to_rule_name, actions_spec,
-                       sources_handled_by_action):
+def _VerifySourcesExist(sources, root_dir):
+  """Verifies that all source files exist on disk.
+
+  Checks that all regular source files, i.e. not created at run time,
+  exist on disk.  Missing files cause needless recompilation but no otherwise
+  visible errors.
+
+  Arguments:
+    sources: A recursive list of Filter/file names.
+    root_dir: The root directory for the relative path names.
+  """
+  for source in sources:
+    if isinstance(source, MSVSProject.Filter):
+      _VerifySourcesExist(source.contents, root_dir)
+    else:
+      if '$' not in source:
+        full_path = os.path.join(root_dir, source)
+        if not os.path.exists(full_path):
+          print 'Error: Missing input file ' + full_path
+
+
+def _GetMSBuildSources(spec, sources, exclusions, extension_to_rule_name,
+                       actions_spec, sources_handled_by_action):
   groups = ['none', 'midl', 'include', 'compile', 'resource', 'rule']
   grouped_sources = {}
   for g in groups:
     grouped_sources[g] = []
 
-  _AddSources2(spec, root_dir, sources, exclusions, grouped_sources,
+  _AddSources2(spec, sources, exclusions, grouped_sources,
                extension_to_rule_name, sources_handled_by_action)
   sources = []
   for g in groups:
     if grouped_sources[g]:
       sources.append(['ItemGroup'] + grouped_sources[g])
   if actions_spec:
     sources.append(['ItemGroup'] + actions_spec)
   return sources
 
 
-def _AddSources2(spec, root_dir, sources, exclusions, grouped_sources,
+def _AddSources2(spec, sources, exclusions, grouped_sources,
                  extension_to_rule_name, sources_handled_by_action):
   for source in sources:
     if isinstance(source, MSVSProject.Filter):
-      _AddSources2(spec, root_dir, source.contents, exclusions, grouped_sources,
+      _AddSources2(spec, source.contents, exclusions, grouped_sources,
                    extension_to_rule_name, sources_handled_by_action)
     else:
-      # If it is a regular source file, i.e. not created at run time,
-      # warn if it does not exists.  Missing header files will cause needless
-      # recompilation but no otherwise visible errors.
-      if '$' not in source:
-        full_path = os.path.join(root_dir, source)
-        if not os.path.exists(full_path):
-          print 'Warning: Missing input file ' + full_path
       if not source in sources_handled_by_action:
         detail = []
         excluded_configurations = exclusions.get(source, [])
         if len(excluded_configurations) == len(spec['configurations']):
           detail.append(['ExcludedFromBuild', 'true'])
         else:
           for config_name, configuration in sorted(excluded_configurations):
             condition = _GetConfigurationCondition(config_name, configuration)
             detail.append(['ExcludedFromBuild',
                            {'Condition': condition},
@@ skipping 66 matching lines @@
   # Don't excluded sources with actions attached, or they won't run.
   excluded_sources = _FilterActionsFromExcluded(
       excluded_sources, actions_to_add)
 
   exclusions = _GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl)
   actions_spec, sources_handled_by_action = _GenerateActionsForMSBuild(
       spec, actions_to_add)
 
   _GenerateMSBuildFiltersFile(project.path + '.filters', sources,
                               extension_to_rule_name)
+  _VerifySourcesExist(sources, gyp_dir)
 
   for (_, configuration) in configurations.iteritems():
     _FinalizeMSBuildSettings(spec, configuration)
 
   # Add attributes to root element
 
   doc = easy_xml.EasyXml(
       'Project',
       {'xmlns': 'http://schemas.microsoft.com/developer/msbuild/2003',
        'ToolsVersion': version.ProjectVersion(),
@@ skipping 13 matching lines @@
   content += import_default_section
   content += _GetMSBuildConfigurationDetails(spec, project.build_file)
   content += import_cpp_props_section
   content += _GetMSBuildExtensions(props_files_of_rules)
   content += _GetMSBuildPropertySheets(configurations)
   content += macro_section
   content += _GetMSBuildConfigurationGlobalProperties(spec, configurations,
                                                       project.build_file)
   content += _GetMSBuildToolSettingsSections(spec, configurations)
   content += _GetMSBuildSources(
-      spec, gyp_dir, sources, exclusions, extension_to_rule_name, actions_spec,
+      spec, sources, exclusions, extension_to_rule_name, actions_spec,
       sources_handled_by_action)
   content += _GetMSBuildProjectReferences(project)
   content += import_cpp_targets_section
   content += _GetMSBuildExtensionTargets(targets_files_of_rules)
 
   # TODO(jeanluc) File a bug to get rid of runas.  We had in MSVS:
   # has_run_as = _WriteMSVSUserFile(project.path, version, spec)
 
   doc.AppendChildren(doc.Root(), content)
   doc.WriteIfChanged(project.path)
@@ skipping 71 matching lines @@
   action_spec.extend(
       # TODO(jeanluc) 'Document' for all or just if as_sources?
       [['FileType', 'Document'],
        ['Command', command],
        ['Message', description],
        ['Outputs', outputs]
       ])
   if additional_inputs:
     action_spec.append(['AdditionalInputs', additional_inputs])
   actions_spec.append(action_spec)