win msvs: make ordering match .gyp order

pylib/gyp/generator/msvs.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 ntpath
 import os
 import posixpath
 import re
 import subprocess
@@ skipping 574 matching lines @@
       cmd = [_RuleExpandPath(c, tf) for c in rule['action']]
       cmd = ['"%s"' % i for i in cmd]
       cmd = ' '.join(cmd)
       # Add it to the makefile.
       mk_file.write('%s: %s\n' % (' '.join(outputs), ' '.join(inputs)))
       mk_file.write('\t%s\n\n' % cmd)
   # Close up the file.
   mk_file.close()
 
   # Add makefile to list of sources.
   sources.add(filename)

[Nico, 2013/12/06 16:28:29]

Will this still work?

   # Add a build action to call makefile.
   cmd = ['make',
          'OutDir=$(OutDir)',
          'IntDir=$(IntDir)',
          '-j', '${NUMBER_OF_PROCESSORS_PLUS_1}',
          '-f', filename]
   cmd = _BuildCommandLineForRuleRaw(spec, cmd, True, False, True, True)
   # Insert makefile as 0'th input, so it gets the action attached there,
   # as this is easier to understand from in the IDE.
   all_inputs = list(all_inputs)
@@ skipping 189 matching lines @@
   for rule in rules:
     # Done if not processing outputs as sources.
     if int(rule.get('process_outputs_as_sources', False)):
       # Add in the outputs from this rule.
       trigger_files = _FindRuleTriggerFiles(rule, sources)
       for trigger_file in trigger_files:
         inputs, outputs = _RuleInputsAndOutputs(rule, trigger_file)
         inputs = set(_FixPaths(inputs))
         outputs = set(_FixPaths(outputs))
         inputs.remove(_FixPath(trigger_file))
         sources.update(inputs)

[Nico, 2013/12/06 16:28:29]

Won't this throw now that sources is a set? (I guess it's fine somehow if tests
pass? I don't understand why though.)

         if not spec.get('msvs_external_builder'):
           excluded_sources.update(inputs)
         sources.update(outputs)
 
 
 def _FilterActionsFromExcluded(excluded_sources, actions_to_add):
   """Take inputs with actions attached out of the list of exclusions.
 
   Arguments:
     excluded_sources: list of source files not to be built.
@@ skipping 67 matching lines @@
   # Skip emitting anything if told to with msvs_existing_vcproj option.
   if default_config.get('msvs_existing_vcproj'):
     return []
 
   if version.UsesVcxproj():
     return _GenerateMSBuildProject(project, options, version, generator_flags)
   else:
     return _GenerateMSVSProject(project, options, version, generator_flags)
 
 
 def _GenerateMSVSProject(project, options, version, generator_flags):

[Nico, 2013/12/06 16:28:29]

Unrelated: This can probably be removed eventually

   """Generates a .vcproj file.  It may create .rules and .user files too.
 
   Arguments:
     project: The project object we will generate the file for.
     options: Global options passed to the generator.
     version: The VisualStudioVersion object.
     generator_flags: dict of generator-specific flags.
   """
   spec = project.spec
   vcproj_dir = os.path.dirname(project.path)
@@ skipping 419 matching lines @@
   if 'IntermediateDirectory' not in prepared_attrs:
     intermediate = '$(ConfigurationName)\\obj\\$(ProjectName)'
     prepared_attrs['IntermediateDirectory'] = _FixPath(intermediate) + '\\'
   else:
     intermediate = _FixPath(prepared_attrs['IntermediateDirectory']) + '\\'
     intermediate = MSVSSettings.FixVCMacroSlashes(intermediate)
     prepared_attrs['IntermediateDirectory'] = intermediate
   return prepared_attrs
 
 
-def _AddNormalizedSources(sources_set, sources_array):
+def _AddNormalizedSources(sources_list, sources_array):

[Nico, 2013/12/06 16:28:29]

sources_list and sources_array, hm? :-)

   sources = [_NormalizedSource(s) for s in sources_array]
-  sources_set.update(set(sources))
+  sources_list.extend(sources)
 
 
 def _PrepareListOfSources(spec, generator_flags, gyp_file):
   """Prepare list of sources and excluded sources.
 
   Besides the sources specified directly in the spec, adds the gyp file so
   that a change to it will cause a re-compile. Also adds appropriate sources
   for actions and copies. Assumes later stage will un-exclude files which
   have custom build steps attached.
 
   Arguments:
     spec: The target dictionary containing the properties of the target.
     gyp_file: The name of the gyp file.
   Returns:
     A pair of (list of sources, list of excluded sources).
     The sources will be relative to the gyp file.
   """
-  sources = set()
+  sources = list()
   _AddNormalizedSources(sources, spec.get('sources', []))
-  excluded_sources = set()
+  excluded_sources = list()
   # Add in the gyp file.
   if not generator_flags.get('standalone'):
-    sources.add(gyp_file)
+    sources.append(gyp_file)
 
   # Add in 'action' inputs and outputs.
   for a in spec.get('actions', []):
     inputs = a['inputs']
     inputs = [_NormalizedSource(i) for i in inputs]
     # Add all inputs to sources and excluded sources.
-    inputs = set(inputs)
-    sources.update(inputs)
+    sources.extend(inputs)
     if not spec.get('msvs_external_builder'):
-      excluded_sources.update(inputs)
+      excluded_sources.extend(inputs)
     if int(a.get('process_outputs_as_sources', False)):
       _AddNormalizedSources(sources, a.get('outputs', []))
   # Add in 'copies' inputs and outputs.
   for cpy in spec.get('copies', []):
     _AddNormalizedSources(sources, cpy.get('files', []))
   return (sources, excluded_sources)
 
 
 def _AdjustSourcesAndConvertToFilterHierarchy(
     spec, options, gyp_dir, sources, excluded_sources, list_excluded):
   """Adjusts the list of sources and excluded sources.
 
   Also converts the sets to lists.

[Nico, 2013/12/06 16:28:29]

remove?

 
   Arguments:
     spec: The target dictionary containing the properties of the target.
     options: Global generator options.
     gyp_dir: The path to the gyp file being processed.
-    sources: A set of sources to be included for this project.
-    excluded_sources: A set of sources to be excluded for this project.
+    sources: A list of sources to be included for this project.
+    excluded_sources: A list of sources to be excluded for this project.

[Nico, 2013/12/06 16:28:29]

maybe add list_excluded while you're here

   Returns:
     A trio of (list of sources, list of excluded sources,
                path of excluded IDL file)
   """
   # Exclude excluded sources coming into the generator.
-  excluded_sources.update(set(spec.get('sources_excluded', [])))
+  excluded_sources.extend(spec.get('sources_excluded', []))
   # Add excluded sources into sources for good measure.
-  sources.update(excluded_sources)
+  sources.extend(excluded_sources)
   # Convert to proper windows form.
   # NOTE: sources goes from being a set to a list here.
   # NOTE: excluded_sources goes from being a set to a list here.
   sources = _FixPaths(sources)
   # Convert to proper windows form.
   excluded_sources = _FixPaths(excluded_sources)
 
   excluded_idl = _IdlFilesHandledNonNatively(spec, sources)
 
   precompiled_related = _GetPrecompileRelatedFiles(spec)
@@ skipping 1853 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)