Reverting 8665.

build/SConscript.main

 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 import shutil
 import sys
 
 
 if sys.platform == 'win32':
@@ skipping 214 matching lines @@
 # Add the final list into the root environment to be build in BuildComponents.
 root_env.Append(BUILD_SCONSCRIPTS = sconscripts)
 
 
 
 # --------------------------------------------------------------------------
 # Windows specific
 
 windows_env = root_env.Clone()
 
-# TODO(siggi) Remove this line once SCons plays well when the 
-# Platform SDK 6.1 is installed with VS2005 but not VS2008.
-windows_env['MSVS_VERSION'] = '8.0'
-
 windows_env.Tool('target_platform_windows')
 windows_env.Tool('component_targets_msvs')  # Per target project support.
 
 # Hammer's target_platform_windows module added the stock SCons
 # MSVSProject() and MSVSSolution() Builders, which we're going to
 # replace with our newer, more flexible implementation.  Wipe out the
 # older ones so they don't interfere with our initialization and so
 # SCons doesn't propagate them to cloned construction environments.
 del windows_env['BUILDERS']['MSVSProject']
 del windows_env['BUILDERS']['MSVSSolution']
@@ skipping 578 matching lines @@
         'all_libraries',
         'all_languages',
         'all_programs',
         'all_test_programs',
     ], projects = [p],
     COMPONENT_VS_PROJECT_SCRIPT_PATH=(
         'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'),
 )
 
 # -------------------------------------------------------------------------