win msvs: make ordering match .gyp order

pylib/gyp/generator/msvs.py

Index: pylib/gyp/generator/msvs.py
diff --git a/pylib/gyp/generator/msvs.py b/pylib/gyp/generator/msvs.py
index 0287eb19e0671d505f31a7ed2bed0b311096f296..72faa4edadaad0ee437c3aa419dcea206f5ee0bb 100644
--- a/pylib/gyp/generator/msvs.py
+++ b/pylib/gyp/generator/msvs.py
@@ -1330,9 +1330,9 @@ def _GetMSVSAttributes(spec, config, config_type):
   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):
@@ -1350,22 +1350,21 @@ def _PrepareListOfSources(spec, generator_flags, gyp_file):
     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.
@@ -1384,16 +1383,16 @@ def _AdjustSourcesAndConvertToFilterHierarchy(
     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.