Updates to Visual Studio project generation to accomodate...

net/net_lib.scons

 # 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.
 
 __doc__ = """
 Configuration for building net.lib / libnet.a.
 """
 
 Import('env')
 
@@ skipping 323 matching lines @@
                CPPDEFINES=['_LIB'])
   pch, obj = env_p.PCH('precompiled_net.pch', 'build/precompiled_net.cc')
   env['PCH'] = pch
   env['PCHSTOP'] = 'precompiled_net.h'
   env.Append(CCPCHFLAGS = ['/FIprecompiled_net.h'])
   input_files.Replace('build/precompiled_net.cc', obj)
 
 lib = env.ChromeLibrary('net', input_files)
 
 p = env.ChromeMSVSProject('$NET_DIR/build/net.vcproj',
+                          dest='$CHROME_SRC_DIR/net/build/net.vcproj',
                           guid='{326E9795-E760-410A-B69A-3F79DB3F5243}',
                           dependencies = [
-                              '$NET_DIR/build/tld_cleanup.vcproj'
+                              '$NET_DIR/build/net_resources.vcproj',
+                              '$NET_DIR/build/tld_cleanup.vcproj',
                           ],
                           # TODO: restore when we can derive all info,
                           # on all platforms, from the windows build targets.
                           #buildtargets=[lib[0]],
                           files=input_files,
                           ConfigurationType='4')
 
 p.AddToolFile('build/convert_tld_data.rules')
 
 p.AddConfig('Debug|Win32',
             InheritedPropertySheets=[
-                '$(SolutionDir)../build/common.vsprops',
                 '$(SolutionDir)../build/debug.vsprops',
-                '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops',
-                '$(SolutionDir)../third_party/zlib/using_zlib.vsprops',
-                '$(SolutionDir)../sdch/using_sdch.vsprops',
-                '$(SolutionDir)../tools/grit/build/using_generated_resources.vsprops',
+                './net.vsprops',
             ],
             tools=[
                 'VCPreBuildEventTool',
                 'VCCustomBuildTool',
                 'Convert TLD Data File',
                 'VCXMLDataGeneratorTool',
                 'VCWebServiceProxyGeneratorTool',
                 'VCMIDLTool',
                 MSVSTool('VCCLCompilerTool',
                          PrecompiledHeaderThrough='precompiled_net.h',
                          ForcedIncludeFiles='precompiled_net.h',
                          UsePrecompiledHeader='2'),
                 'VCManagedResourceCompilerTool',
                 'VCResourceCompilerTool',
                 'VCPreLinkEventTool',
                 'VCLibrarianTool',
                 'VCALinkTool',
                 'VCXDCMakeTool',
                 'VCBscMakeTool',
                 'VCFxCopTool',
                 'VCPostBuildEventTool',
             ])
 
 p.AddConfig('Release|Win32',
             InheritedPropertySheets=[
-                '$(SolutionDir)../build/common.vsprops',
                 '$(SolutionDir)../build/release.vsprops',
-                '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops',
-                '$(SolutionDir)../third_party/zlib/using_zlib.vsprops',
-                '$(SolutionDir)../sdch/using_sdch.vsprops',
-                '$(SolutionDir)../tools/grit/build/using_generated_resources.vsprops',
+                './net.vsprops',
             ],
             tools=[
                 'VCPreBuildEventTool',
                 'VCCustomBuildTool',
                 'Convert TLD Data File',
                 'VCXMLDataGeneratorTool',
                 'VCWebServiceProxyGeneratorTool',
                 'VCMIDLTool',
                 'VCCLCompilerTool',
                 'VCManagedResourceCompilerTool',
@@ skipping 15 matching lines @@
                              UsePrecompiledHeader='1'),
                 ])
 
 # TODO(sgk):  remove when we can derive this information
 p.AddFileConfig('build/precompiled_net.cc',
                 'Release|Win32',
                 ExcludedFromBuild='true',
                 tools=[
                     'VCCLCompilerTool',
                 ])
-
-env.AlwaysBuild(p)
-
-i = env.Command('$CHROME_SRC_DIR/net/build/net.vcproj', p,
-                Copy('$TARGET', '$SOURCE'))
-Alias('msvs', i)