diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-12-23 20:47:20 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-12-23 20:47:20 +0000 |
| commit | 24265424027ffff14861ef9b6de9e57307b9feeb (patch) | |
| tree | c6205a642c086595c68802e0a267c5f701938eee /scons | |
| parent | 7b0c8dd3a94fed17493e2f01dc2fa32bc1eb3a20 (diff) | |
| download | googletest-24265424027ffff14861ef9b6de9e57307b9feeb.tar.gz googletest-24265424027ffff14861ef9b6de9e57307b9feeb.tar.bz2 googletest-24265424027ffff14861ef9b6de9e57307b9feeb.zip | |
Removes support for MSVC 7.1 from the scons scripts.
Diffstat (limited to 'scons')
| -rw-r--r-- | scons/SConstruct | 16 | ||||
| -rw-r--r-- | scons/SConstruct.common | 9 |
2 files changed, 7 insertions, 18 deletions
diff --git a/scons/SConstruct b/scons/SConstruct index f4f82374..5c0b038a 100644 --- a/scons/SConstruct +++ b/scons/SConstruct @@ -39,7 +39,7 @@ # where frequently used command-line options include: # -h print usage help. # BUILD=all build all build types. -# BUILD=win-opt build the given build type. +# BUILD=win-opt8 build the given build type. EnsurePythonVersion(2, 3) @@ -49,18 +49,10 @@ sconstruct_helper.Initialize(build_root_path='..', support_multiple_win_builds=False) win_base = sconstruct_helper.MakeWinBaseEnvironment() +win_base['GTEST_BUILD_DLL_TEST'] = True -# We don't support VC 7.1 with exceptions disabled, so we always -# enable exceptions for VC 7.1. For newer versions of VC, we still -# compile with exceptions disabled by default, as that's a more common -# setting for our users. -if win_base.get('MSVS_VERSION', None) == '7.1': - sconstruct_helper.EnableExceptions(win_base) -else: - win_base['GTEST_BUILD_DLL_TEST'] = True - -sconstruct_helper.MakeWinDebugEnvironment(win_base, 'win-dbg') -sconstruct_helper.MakeWinOptimizedEnvironment(win_base, 'win-opt') +sconstruct_helper.MakeWinDebugEnvironment(win_base, 'win-dbg8') +sconstruct_helper.MakeWinOptimizedEnvironment(win_base, 'win-opt8') sconstruct_helper.ConfigureGccEnvironments() diff --git a/scons/SConstruct.common b/scons/SConstruct.common index 10947aea..59b8864b 100644 --- a/scons/SConstruct.common +++ b/scons/SConstruct.common @@ -56,10 +56,7 @@ class SConstructHelper: test_env = Environment() platform = test_env['PLATFORM'] if platform == 'win32': - if support_multiple_win_builds: - available_build_types = ['win-dbg8', 'win-opt8', 'win-dbg', 'win-opt'] - else: - available_build_types = ['win-dbg', 'win-opt'] + available_build_types = ['win-dbg8', 'win-opt8'] elif platform == 'darwin': # MacOSX available_build_types = ['mac-dbg', 'mac-opt'] else: @@ -144,7 +141,7 @@ class SConstructHelper: self.env_dict[name] = env def MakeWinDebugEnvironment(self, base_environment, name): - """Takes a VC71 or VC80 base environment and adds debug settings.""" + """Takes an MSVC base environment and adds debug settings.""" debug_env = base_environment.Clone() self.SetBuildNameAndDir(debug_env, name) debug_env.Append( @@ -164,7 +161,7 @@ class SConstructHelper: return debug_env def MakeWinOptimizedEnvironment(self, base_environment, name): - """Takes a VC71 or VC80 base environment and adds release settings.""" + """Takes an MSVC base environment and adds release settings.""" optimized_env = base_environment.Clone() self.SetBuildNameAndDir(optimized_env, name) optimized_env.Append( |