diff options
| author | stopiccot <devnull@localhost> | 2012-03-04 16:30:08 +0300 |
|---|---|---|
| committer | stopiccot <devnull@localhost> | 2012-03-04 16:30:08 +0300 |
| commit | dc75ea1403e865a62854ec697fffdf45d158dad2 (patch) | |
| tree | 05b3efa619ee9409b19ad5dda212d86d2569d64f | |
| parent | e8ad435e2ec5bc1e50e26d83058531c2d82152af (diff) | |
| download | scons-git-dc75ea1403e865a62854ec697fffdf45d158dad2.tar.gz | |
fix + solution generation fixes
| -rw-r--r-- | src/engine/SCons/Tool/MSCommon/vs.py | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/msvs.py | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/engine/SCons/Tool/MSCommon/vs.py b/src/engine/SCons/Tool/MSCommon/vs.py index bc77cad92..d5bf2c3eb 100644 --- a/src/engine/SCons/Tool/MSCommon/vs.py +++ b/src/engine/SCons/Tool/MSCommon/vs.py @@ -217,7 +217,7 @@ SupportedVSList = [ VisualStudio('11.0', sdk_version='6.1', hkeys=[r'Microsoft\VisualStudio\11.0\Setup\VS\ProductDir'], - common_tools_var='VS100COMNTOOLS', + common_tools_var='VS110COMNTOOLS', executable_path=r'Common7\IDE\devenv.com', batch_file_path=r'Common7\Tools\vsvars32.bat', default_dirname='Microsoft Visual Studio 11', @@ -231,7 +231,7 @@ SupportedVSList = [ vc_version='11.0', sdk_version='6.1', hkeys=[r'Microsoft\VCExpress\11.0\Setup\VS\ProductDir'], - common_tools_var='VS100COMNTOOLS', + common_tools_var='VS110COMNTOOLS', executable_path=r'Common7\IDE\VCExpress.exe', batch_file_path=r'Common7\Tools\vsvars32.bat', default_dirname='Microsoft Visual Studio 11', diff --git a/src/engine/SCons/Tool/msvs.py b/src/engine/SCons/Tool/msvs.py index 40773247e..2b5373dbe 100644 --- a/src/engine/SCons/Tool/msvs.py +++ b/src/engine/SCons/Tool/msvs.py @@ -1205,7 +1205,9 @@ class _GenerateV7DSW(_DSWGenerator): self.version = self.env['MSVS_VERSION'] self.version_num, self.suite = msvs_parse_version(self.version) self.versionstr = '7.00' - if self.version_num >= 10.0: + if self.version_num >= 11.0: + self.versionstr = '12.0' + elif self.version_num >= 10.0: self.versionstr = '11.00' elif self.version_num >= 9.0: self.versionstr = '10.00' @@ -1308,13 +1310,16 @@ class _GenerateV7DSW(_DSWGenerator): def PrintSolution(self): """Writes a solution file""" - self.file.write('Microsoft Visual Studio Solution File, Format Version %s\n' % self.versionstr ) - if self.version_num >= 10.0: + self.file.write('Microsoft Visual Studio Solution File, Format Version %s\n' % self.versionstr) + if self.versionstr >= 11.0: + self.file.write('# Visual Studio 11\n') + elif self.version_num >= 10.0: self.file.write('# Visual Studio 2010\n') elif self.version_num >= 9.0: self.file.write('# Visual Studio 2008\n') elif self.version_num >= 8.0: self.file.write('# Visual Studio 2005\n') + for dspinfo in self.dspfiles_info: name = dspinfo['NAME'] base, suffix = SCons.Util.splitext(name) |