From 7a92ac91d028dbfe387d50c39b0115e617012580 Mon Sep 17 00:00:00 2001 From: evhub Date: Fri, 11 Jul 2014 14:47:52 -0700 Subject: [PATCH] Fix VSProject item sorting (again) Conflicts: src/beast/site_scons/site_tools/VSProject.py --- site_scons/site_tools/VSProject.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/site_scons/site_tools/VSProject.py b/site_scons/site_tools/VSProject.py index 9d6e54d03..7a83a4b1f 100644 --- a/site_scons/site_tools/VSProject.py +++ b/site_scons/site_tools/VSProject.py @@ -102,9 +102,15 @@ def xsorted(tosort, **kwargs): if isinstance(item, (str, unicode)): return ("s", item.upper(), item) elif isinstance(item, (list, tuple)): - return ("c", map(_key, item)) + return ("l", map(_key, item)) elif isinstance(item, dict): return ("d", xsorted(item.keys()), xsorted(item.values())) + elif isinstance(item, Configuration): + return ("c", item.target, item.platform, item.variant) + elif isinstance(item, Item): + return ("i", item._path, item._builder) + elif isinstance(item, SCons.Node.FS.File): + return ("f", item.name, item.suffix) else: return ("x", item) kwargs['key'] = _key