win: fixes for using vs 2013 toolchain

pylib/gyp/MSVSVersion.py

 # Copyright (c) 2013 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.
 
 """Handle version information related to Visual Stuio."""
 
 import errno
 import os
 import re
 import subprocess
@@ skipping 373 matching lines @@
     '2010': ('10.0',),
     '2010e': ('10.0',),
     '2012': ('11.0',),
     '2012e': ('11.0',),
     '2013': ('12.0',),
     '2013e': ('12.0',),
   }
   override_path = os.environ.get('GYP_MSVS_OVERRIDE_PATH')
   if override_path:
     msvs_version = os.environ.get('GYP_MSVS_VERSION')
-    if not msvs_version or 'e' not in msvs_version:

[scottmg, 2013/11/08 21:43:39]

This was overly restrictive, I'm updating the toolchain script to support
building a "pro" based installation and there's no reason not to allow
non-Express as well here.

+    if not msvs_version:
       raise ValueError('GYP_MSVS_OVERRIDE_PATH requires GYP_MSVS_VERSION to be '
-                       'set to an "e" version (e.g. 2010e)')
+                       'set to a particular version (e.g. 2010e).')
     return _CreateVersion(msvs_version, override_path, sdk_based=True)
   version = str(version)
   versions = _DetectVisualStudioVersions(version_map[version], 'e' in version)
   if not versions:
     if version == 'auto':
       # Default to 2005 if we couldn't find anything
       return _CreateVersion('2005', None)
     else:
       return _CreateVersion(version, None)
   return versions[0]