diff options
| author | William Deegan <bill@baddogconsulting.com> | 2012-08-17 23:03:00 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2012-08-17 23:03:00 (GMT) |
| commit | d7683b28d39cdb741f999fa2fb9c1ea34719a542 (patch) | |
| tree | 8bb3c1b1074fbb43f05e632f9003995b6f28b853 | |
| parent | 695972e743aef7d860b2b70ae4412a6994a1a94f (diff) | |
| parent | 6db1108bb06d67e9d533f4cbedab98d1a4a79082 (diff) | |
| download | SCons-d7683b28d39cdb741f999fa2fb9c1ea34719a542.zip SCons-d7683b28d39cdb741f999fa2fb9c1ea34719a542.tar.gz SCons-d7683b28d39cdb741f999fa2fb9c1ea34719a542.tar.bz2 | |
Merge update
| -rw-r--r-- | src/CHANGES.txt | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/msvs.py | 4 | ||||
| -rw-r--r-- | test/MSVS/vs-10.0-scc-files.py | 2 | ||||
| -rw-r--r-- | test/MSVS/vs-10.0-scc-legacy-files.py | 2 | ||||
| -rw-r--r-- | test/MSVS/vs-11.0-scc-files.py | 2 | ||||
| -rw-r--r-- | test/MSVS/vs-11.0-scc-legacy-files.py | 2 |
6 files changed, 8 insertions, 6 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') diff --git a/test/MSVS/vs-10.0-scc-files.py b/test/MSVS/vs-10.0-scc-files.py index 48857b6..32dd9ef 100644 --- a/test/MSVS/vs-10.0-scc-files.py +++ b/test/MSVS/vs-10.0-scc-files.py @@ -51,7 +51,7 @@ env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='10.0', MSVS_SCC_PROJECT_NAME='Perforce Project') testsrc = ['test1.cpp', 'test2.cpp'] -testincs = ['sdk.h'] +testincs = ['sdk_dir\sdk.h'] testlocalincs = ['test.h'] testresources = ['test.rc'] testmisc = ['readme.txt'] diff --git a/test/MSVS/vs-10.0-scc-legacy-files.py b/test/MSVS/vs-10.0-scc-legacy-files.py index 4a5d5a8..14276a7 100644 --- a/test/MSVS/vs-10.0-scc-legacy-files.py +++ b/test/MSVS/vs-10.0-scc-legacy-files.py @@ -50,7 +50,7 @@ env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='10.0', MSVS_SCC_PROJECT_NAME='Perforce Project') testsrc = ['test1.cpp', 'test2.cpp'] -testincs = ['sdk.h'] +testincs = ['sdk_dir\sdk.h'] testlocalincs = ['test.h'] testresources = ['test.rc'] testmisc = ['readme.txt'] diff --git a/test/MSVS/vs-11.0-scc-files.py b/test/MSVS/vs-11.0-scc-files.py index 8cc0465..6d12c79 100644 --- a/test/MSVS/vs-11.0-scc-files.py +++ b/test/MSVS/vs-11.0-scc-files.py @@ -51,7 +51,7 @@ env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='11.0', MSVS_SCC_PROJECT_NAME='Perforce Project') testsrc = ['test1.cpp', 'test2.cpp'] -testincs = ['sdk.h'] +testincs = ['sdk_dir\sdk.h'] testlocalincs = ['test.h'] testresources = ['test.rc'] testmisc = ['readme.txt'] diff --git a/test/MSVS/vs-11.0-scc-legacy-files.py b/test/MSVS/vs-11.0-scc-legacy-files.py index d509138..726f994 100644 --- a/test/MSVS/vs-11.0-scc-legacy-files.py +++ b/test/MSVS/vs-11.0-scc-legacy-files.py @@ -50,7 +50,7 @@ env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='11.0', MSVS_SCC_PROJECT_NAME='Perforce Project') testsrc = ['test1.cpp', 'test2.cpp'] -testincs = ['sdk.h'] +testincs = ['sdk_dir\sdk.h'] testlocalincs = ['test.h'] testresources = ['test.rc'] testmisc = ['readme.txt'] |