Correct the order in which OutputDirectory and IntermediateDirectory are defined.

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 2617 matching lines @@
   """
   if name not in properties:
     properties[name] = {}
   values = properties[name]
   if value not in values:
     values[value] = []
   conditions = values[value]
   conditions.append(condition)
 
 
+MSBUILD_PROPERTY_ORDER = [

[gab, 2012/05/09 15:27:11]

Does this mean we will need to add each new property a gyp user wants to add to
their build here?

i.e. I'm currently adding a new property to PropertyGroup as part of this
upcoming CL:
http://codereview.chromium.org/9701050/diff/8002/build/common.gypi

From _MSBuildPropertyRank() below it looks like any unknown property is just
sorted at the end, which is fine, but I just want to make sure this is the
intended behavior.

[bradn, 2012/05/10 01:48:52]

So I'm gonna swap this all out for the topological sort, which is the right
thing.

+    'OutDir',
+    'IntDir',  # IntDir is usually defined is terms of OutDir so put it later.

[gab, 2012/05/09 15:27:11]

typo: is => in

[bradn, 2012/05/10 01:48:52]

Done.

+    'TargetName',
+    'TargetPath',
+    'ExecutablePath',
+]
+
+
+def _MSBuildPropertyRank(name):
+  """Decide a rank for a property name.
+
+  Returns:
+    A numerical value which is lower if a property should be
+    defined earlier.
+    Place unknown property names last (as other typically don't
+    rely on them).
+  """
+  try:
+    return MSBUILD_PROPERTY_ORDER.index(name)
+  except ValueError:
+    return len(MSBUILD_PROPERTY_ORDER)
+
+
+def _CompareMSBuildProperties(a, b):
+  """Compare two property pairs (name, values).
+
+  Order of definition in msbuild matters. In general we don't make
+  use of properties defined at the same level, but there are exceptions.
+  This function defines a sort order that is mostly alphabetical,
+  with a few items that commonly are used in self reference brought to the
+  front.
+
+  Args:
+    a: (name, values) pair.
+    b: (name, values) pair.
+  Returns:
+    -1, 0, 1 for comparison.
+  """
+  result = cmp(_MSBuildPropertyRank(a[0]), _MSBuildPropertyRank(b[0]))
+  if result != 0:
+    return result
+  return cmp(a, b)
+
+
 def _GetMSBuildPropertyGroup(spec, label, properties):
   """Returns a PropertyGroup definition for the specified properties.
 
   Arguments:
     spec: The target project dict.
     label: An optional label for the PropertyGroup.
     properties: The dictionary to be converted.  The key is the name of the
         property.  The value is itself a dictionary; its key is the value and
         the value a list of condition for which this value is true.
   """
   group = ['PropertyGroup']
   if label:
     group.append({'Label': label})
   num_configurations = len(spec['configurations'])
-  for name, values in sorted(properties.iteritems()):
+  for name, values in sorted(properties.iteritems(), _CompareMSBuildProperties):
     for value, conditions in sorted(values.iteritems()):
       if len(conditions) == num_configurations:
         # If the value is the same all configurations,
         # just add one unconditional entry.
         group.append([name, value])
       else:
         for condition in conditions:
           group.append([name, {'Condition': condition}, value])
   return [group]
 
@@ skipping 401 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)