diff options
author | Gary Oberbrunner <garyo@oberbrunner.com> | 2012-08-14 00:09:18 (GMT) |
---|---|---|
committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2012-08-14 00:09:18 (GMT) |
commit | 80f77401bad632ab355f9fb5b36777d9f214cd3e (patch) | |
tree | 12f386a4ff7c659837315e5885fbba61aaf4ea76 /src | |
parent | fa19ee19b1048e25a8915c6e9c0c7bef11d28481 (diff) | |
download | SCons-80f77401bad632ab355f9fb5b36777d9f214cd3e.zip SCons-80f77401bad632ab355f9fb5b36777d9f214cd3e.tar.gz SCons-80f77401bad632ab355f9fb5b36777d9f214cd3e.tar.bz2 |
Fix MSVS solution generation for VS11, and fixed tests.
Diffstat (limited to 'src')
-rw-r--r-- | src/CHANGES.txt | 2 | ||||
-rw-r--r-- | src/engine/SCons/Tool/msvs.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index faf293f..7665e39 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -6,6 +6,8 @@ RELEASE 2.X.X - + From Gary Oberbrunner: + - Fix MSVS solution generation for VS11, and fixed tests. RELEASE 2.2.0 - Mon, 05 Aug 2012 15:37:48 +0000 diff --git a/src/engine/SCons/Tool/msvs.py b/src/engine/SCons/Tool/msvs.py index 2b5373d..b10868f 100644 --- a/src/engine/SCons/Tool/msvs.py +++ b/src/engine/SCons/Tool/msvs.py @@ -1206,7 +1206,7 @@ class _GenerateV7DSW(_DSWGenerator): self.version_num, self.suite = msvs_parse_version(self.version) self.versionstr = '7.00' if self.version_num >= 11.0: - self.versionstr = '12.0' + self.versionstr = '12.00' elif self.version_num >= 10.0: self.versionstr = '11.00' elif self.version_num >= 9.0: @@ -1311,7 +1311,7 @@ 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.versionstr >= 11.0: + if self.version_num >= 11.0: self.file.write('# Visual Studio 11\n') elif self.version_num >= 10.0: self.file.write('# Visual Studio 2010\n') |