Generate additional .vcproj files in miscellaneous top-level components.

This also updates the .vcproj files themselves to fix minor stylistic
incompatibilities with the rest.  Affected .vcproj files:
* No change (byte-for-byte identical):
    media\build\media.vcproj
    media\build\media_player.vcproj
    media\build\media_unittests.vcproj
    google_update\ondemand_updates.vcproj
* Remove .\ prefix where inconsistent with the rest of a filelist:
    rlz\rlz.vcproj
    breakpad\breakpad_handler.vcproj
* Add empty <ToolFiles>, <References> and <Globals> sections:
    breakpad\breakpad_sender.vcproj
* Add explicit RootNamespace attribute:
    sdch\sdch.vcproj
* Use Windows-canonical \ separators:
    sdch\sdch.vcproj
* Remove unnecessary Filter and UniqueIdentifier attributes from
  <Filter> declarations:
    sdch\sdch.vcproj

Additional cleanups along for the ride:
* Split breakpad\SConscript logic into separate
  breakpad_{handler,sender}.scons files.
* Add a media\media_player.scons configuration.
Review URL: http://codereview.chromium.org/18717

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8644 0039d316-1c4b-4281-b951-d872f2087c98

14 files changed, 534 insertions, 113 deletions

diff --git a/breakpad/SConscript b/breakpad/SConscript
index fe2ca9f..c68fc8a 100644
--- a/breakpad/SConscript
+++ b/breakpad/SConscript
@@ -2,54 +2,15 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-Import('env')
-
-env = env.Clone()
-
-env.Prepend(
-    CPPPATH = [
-        'src',
-        '$CHROME_SRC_DIR',
-    ],
-)
-
-if env.Bit('windows'):
-  env.Append(
-      CCFLAGS = [
-          '/TP',
-          '/wd4800',
-      ],
-  )
-
-  sender_input_files = [
-      'src/client/windows/sender/crash_report_sender.cc',
-      'src/common/windows/http_upload.cc',
-  ]
+__doc__ = """
+Master configuration for building breakpad libraries.
+"""
 
-  env.ChromeLibrary('breakpad_sender', sender_input_files)
-
-env.ChromeMSVSProject('$BREAKPAD_DIR/breakpad_sender.vcproj',
-                guid='{9946A048-043B-4F8F-9E07-9297B204714C}')
-
-if env.Bit('windows'):
-  handler_input_files = [
-      'src/client/windows/crash_generation/client_info.cc',
-      'src/client/windows/crash_generation/minidump_generator.cc',
-      'src/common/windows/guid_string.cc',
-      'src/client/windows/handler/exception_handler.cc',
-      'src/client/windows/crash_generation/crash_generation_server.cc',
-      'src/client/windows/crash_generation/crash_generation_client.cc',
-  ]
-elif env.Bit('linux'):
-  handler_input_files = [
-      'src/common/linux/guid_creator.cc',
-      'src/client/linux/handler/exception_handler.cc',
-      'src/client/linux/handler/minidump_generator.cc',
-      'src/client/linux/handler/linux_thread.cc',
-  ]
-
-env.ChromeLibrary('breakpad_handler', handler_input_files)
+Import('env')
 
-env.ChromeMSVSProject('$BREAKPAD_DIR/breakpad_handler.vcproj',
-                guid='{B55CA863-B374-4BAF-95AC-539E4FA4C90C}')
+sconscript_files = [
+    'breakpad_handler.scons',
+    'breakpad_sender.scons',
+]
 
+SConscript(sconscript_files, exports=['env'])
diff --git a/breakpad/breakpad_handler.scons b/breakpad/breakpad_handler.scons
new file mode 100644
index 0000000..43c7472
--- /dev/null
+++ b/breakpad/breakpad_handler.scons
@@ -0,0 +1,96 @@
+# 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('env')
+
+env = env.Clone()
+
+env.Prepend(
+    CPPPATH = [
+        'src',
+        '$CHROME_SRC_DIR',
+    ],
+)
+
+input_files = ChromeFileList([
+    'src/client/windows/crash_generation/client_info.cc',
+    'src/client/windows/crash_generation/client_info.h',
+    'src/client/windows/crash_generation/crash_generation_client.cc',
+    'src/client/windows/crash_generation/crash_generation_client.h',
+    'src/client/windows/crash_generation/crash_generation_server.cc',
+    'src/client/windows/crash_generation/crash_generation_server.h',
+    'src/client/windows/handler/exception_handler.cc',
+    'src/client/windows/handler/exception_handler.h',
+    'src/common/windows/guid_string.cc',
+    'src/common/windows/guid_string.h',
+    'src/google_breakpad/common/minidump_format.h',
+    'src/client/windows/crash_generation/minidump_generator.cc',
+    'src/client/windows/crash_generation/minidump_generator.h',
+    'src/common/windows/string_utils-inl.h',
+])
+
+if not env.Bit('windows'):
+  input_files.Remove(
+      'src/client/windows/crash_generation/client_info.cc',
+      'src/client/windows/crash_generation/minidump_generator.cc',
+      'src/common/windows/guid_string.cc',
+      'src/client/windows/handler/exception_handler.cc',
+      'src/client/windows/crash_generation/crash_generation_server.cc',
+      'src/client/windows/crash_generation/crash_generation_client.cc',
+  )
+
+if not env.Bit('linux'):
+  input_files.Remove(
+      'src/common/linux/guid_creator.cc',
+      'src/client/linux/handler/exception_handler.cc',
+      'src/client/linux/handler/minidump_generator.cc',
+      'src/client/linux/handler/linux_thread.cc',
+  )
+
+env.ChromeLibrary('breakpad_handler', input_files)
+
+p = env.ChromeMSVSProject('breakpad_handler.vcproj',
+                          dest=('$CHROME_SRC_DIR/breakpad/' +
+                                    'breakpad_handler.vcproj'),
+                          guid='{B55CA863-B374-4BAF-95AC-539E4FA4C90C}',
+                          keyword='Win32Proj',
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              'VCLibrarianTool',
+                              'VCALinkTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='4')
+
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                '$(SolutionDir)../build/external_code.vsprops',
+                './using_breakpad.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+                '$(SolutionDir)../build/external_code.vsprops',
+                './using_breakpad.vsprops',
+            ])
diff --git a/breakpad/breakpad_handler.vcproj b/breakpad/breakpad_handler.vcproj
index 680bb19..422b552 100644
--- a/breakpad/breakpad_handler.vcproj
+++ b/breakpad/breakpad_handler.vcproj
@@ -122,27 +122,27 @@
 	</References>
 	<Files>
 		<File
-			RelativePath=".\src\client\windows\crash_generation\client_info.cc"
+			RelativePath="src\client\windows\crash_generation\client_info.cc"
 			>
 		</File>
 		<File
-			RelativePath=".\src\client\windows\crash_generation\client_info.h"
+			RelativePath="src\client\windows\crash_generation\client_info.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\client\windows\crash_generation\crash_generation_client.cc"
+			RelativePath="src\client\windows\crash_generation\crash_generation_client.cc"
 			>
 		</File>
 		<File
-			RelativePath=".\src\client\windows\crash_generation\crash_generation_client.h"
+			RelativePath="src\client\windows\crash_generation\crash_generation_client.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\client\windows\crash_generation\crash_generation_server.cc"
+			RelativePath="src\client\windows\crash_generation\crash_generation_server.cc"
 			>
 		</File>
 		<File
-			RelativePath=".\src\client\windows\crash_generation\crash_generation_server.h"
+			RelativePath="src\client\windows\crash_generation\crash_generation_server.h"
 			>
 		</File>
 		<File
@@ -166,11 +166,11 @@
 			>
 		</File>
 		<File
-			RelativePath=".\src\client\windows\crash_generation\minidump_generator.cc"
+			RelativePath="src\client\windows\crash_generation\minidump_generator.cc"
 			>
 		</File>
 		<File
-			RelativePath=".\src\client\windows\crash_generation\minidump_generator.h"
+			RelativePath="src\client\windows\crash_generation\minidump_generator.h"
 			>
 		</File>
 		<File
diff --git a/breakpad/breakpad_sender.scons b/breakpad/breakpad_sender.scons
new file mode 100644
index 0000000..c97edb7
--- /dev/null
+++ b/breakpad/breakpad_sender.scons
@@ -0,0 +1,63 @@
+# 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('env')
+
+env = env.Clone()
+
+env.Prepend(
+    CPPPATH = [
+        'src',
+        '$CHROME_SRC_DIR',
+    ],
+)
+
+if env.Bit('windows'):
+  env.Append(
+      CCFLAGS = [
+          '/TP',
+          '/wd4800',
+      ],
+  )
+
+input_files = ChromeFileList([
+    'src/client/windows/sender/crash_report_sender.cc',
+    'src/common/windows/http_upload.cc',
+    'src/client/windows/sender/crash_report_sender.h',
+    'src/common/windows/http_upload.h',
+])
+
+if env.Bit('windows'):
+  env.ChromeLibrary('breakpad_sender', input_files)
+
+p = env.ChromeMSVSProject('breakpad_sender.vcproj',
+                          dest=('$CHROME_SRC_DIR/breakpad/' +
+                                    'breakpad_sender.vcproj'),
+                          guid='{9946A048-043B-4F8F-9E07-9297B204714C}',
+                          keyword='Win32Proj',
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          tools=[
+                              'VCLibrarianTool',
+                              'VCCLCompilerTool',
+                          ],
+                          ConfigurationType='4')
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                '$(SolutionDir)../build/external_code.vsprops',
+                'using_breakpad.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+                '$(SolutionDir)../build/external_code.vsprops',
+                'using_breakpad.vsprops',
+            ])
diff --git a/breakpad/breakpad_sender.vcproj b/breakpad/breakpad_sender.vcproj
index ecc1740..569e746 100644
--- a/breakpad/breakpad_sender.vcproj
+++ b/breakpad/breakpad_sender.vcproj
@@ -12,6 +12,8 @@
 			Name="Win32"
 		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
@@ -38,6 +40,8 @@
 			/>
 		</Configuration>
 	</Configurations>
+	<References>
+	</References>
 	<Files>
 		<File
 			RelativePath="src\client\windows\sender\crash_report_sender.cc"
@@ -56,4 +60,6 @@
 			>
 		</File>
 	</Files>
+	<Globals>
+	</Globals>
 </VisualStudioProject>
diff --git a/google_update/SConscript b/google_update/SConscript
index 916b3cb..183e872 100644
--- a/google_update/SConscript
+++ b/google_update/SConscript
@@ -4,9 +4,39 @@
 
 Import('env')
 
+input_files = ChromeFileList([
+    'google_update_idl.idl',
+])
+
 # TODO(port):
 if env.Bit('windows'):
+  # TODO(sgk):  get from the input_files list.
   env.TypeLibrary('google_update_idl')
 
-env.ChromeMSVSProject('$GOOGLE_UPDATE_DIR/ondemand_updates.vcproj',
-                guid='{4052059A-D72B-4183-B5C2-9D1B099E9E35}')
+p = env.ChromeMSVSProject('ondemand_updates.vcproj',
+                          dest=('$CHROME_SRC_DIR/google_update/' +
+                                    'ondemand_updates.vcproj'),
+                          guid='{4052059A-D72B-4183-B5C2-9D1B099E9E35}',
+                          keyword='Win32Proj',
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          relative_path_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCMIDLTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='10')
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/debug.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/release.vsprops',
+            ])
diff --git a/media/media.scons b/media/media.scons
index d069121..aeeac77 100644
--- a/media/media.scons
+++ b/media/media.scons
@@ -16,6 +16,7 @@ env.Append(
 
 sconscript_files = [
     'media_lib.scons',
+    'media_player.scons',
     'media_unittests.scons',
 ]
 
diff --git a/media/media_lib.scons b/media/media_lib.scons
index e24c619..690f902 100644
--- a/media/media_lib.scons
+++ b/media/media_lib.scons
@@ -8,8 +8,6 @@ Configuration for building media.lib / libmedia.a.
 
 Import('env')
 
-env_res = env.Clone()
-env_tests = env.Clone()
 env = env.Clone()
 
 env.SConscript([
@@ -22,32 +20,79 @@ env.Prepend(
     ],
 )
 
-# These net files work on *all* platforms; files that don't work
-# cross-platform live below.
-input_files = [
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('base', [
+    'base/buffers.h',
     'base/data_buffer.cc',
+    'base/data_buffer.h',
+    'base/factory.h',
+    'base/filter_host.h',
     'base/filter_host_impl.cc',
+    'base/filter_host_impl.h',
+    'base/filters.h',
     'base/media_format.cc',
+    'base/media_format.h',
+    'base/pipeline.h',
     'base/pipeline_impl.cc',
-]
+    'base/pipeline_impl.h',
+  ]),
+  MSVSFilter('audio', [
+    'audio/win/audio_manager_win.h',
+    'audio/audio_output.h',
+    'audio/win/audio_output_win.cc',
+    'audio/simple_sources.h',
+    'audio/win/simple_sources_win.cc',
+    'audio/win/waveout_output_win.cc',
+    'audio/win/waveout_output_win.h',
+  ]),
+])
 
-if env.Bit('windows'):
-  input_files.extend([
-  ])
+if not env.Bit('windows'):
+  # Windows-specific files.
+  input_files.Remove(
+      'audio/win/audio_output_win.cc',
+      'audio/win/simple_sources_win.cc',
+      'audio/win/waveout_output_win.cc',
+  )
 
-if env.Bit('mac'):
-  input_files.extend([
-  ])
-
-if env.Bit('linux'):
-  input_files.extend([
-  ])
+env.ChromeLibrary('media', input_files)
 
-if env.Bit('posix'):
-  input_files.extend([
-  ])
+p = env.ChromeMSVSProject('build/media.vcproj',
+                          dest='$CHROME_SRC_DIR/media/build/media.vcproj',
+                          guid='{6AE76406-B03B-11DD-94B1-80B556D89593}',
+                          keyword='Win32Proj',
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              'VCLibrarianTool',
+                              'VCALinkTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='4')
 
-env.ChromeLibrary('media', input_files)
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/debug.vsprops',
+            ])
 
-env.ChromeMSVSProject('$MEDIA_DIR/build/media.vcproj',
-                guid='{6AE76406-B03B-11DD-94B1-80B556D89593}')
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/release.vsprops',
+            ])
diff --git a/media/media_player.scons b/media/media_player.scons
new file mode 100644
index 0000000..87513c6
--- /dev/null
+++ b/media/media_player.scons
@@ -0,0 +1,62 @@
+# 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 media_player.
+"""
+
+Import('env')
+
+env = env.Clone()
+
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('player', [
+      'player/player.cc',
+  ]),
+])
+
+p = env.ChromeMSVSProject('build/media_player.vcproj',
+                          dest=('$CHROME_SRC_DIR/media/' +
+                                    'build/media_player.vcproj'),
+                          guid='{D4EB0EDC-DC4D-11DD-AE66-DC4F55D89593}',
+                          keyword='Win32Proj',
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              'VCLinkerTool',
+                              'VCALinkTool',
+                              'VCManifestTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCAppVerifierTool',
+                              'VCWebDeploymentTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='1')
+
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/debug.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/release.vsprops',
+            ])
diff --git a/media/media_unittests.scons b/media/media_unittests.scons
index 40f348d..984be8f 100644
--- a/media/media_unittests.scons
+++ b/media/media_unittests.scons
@@ -51,12 +51,70 @@ input_files = [
     'base/run_all_unittests.cc',
 ]
 
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('support', [
+    'base/run_all_unittests.cc',
+  ]),
+  MSVSFilter('tests', [
+    MSVSFilter('base', [
+      'base/data_buffer_unittest.cc',
+    ]),
+    MSVSFilter('audio', [
+      'audio/win/audio_output_win_unittest.cc',
+    ]),
+  ]),
+])
+
+if not env.Bit('windows'):
+  input_files.Remove(
+      'audio/win/audio_output_win_unittest.cc',
+  )
+
 env.ChromeTestProgram('media_unittests', input_files)
 
-env.ChromeMSVSProject('$MEDIA_DIR/build/media_unittests.vcproj',
-                dependencies = [
-                    '$BASE_DIR/build/base.vcproj',
-                    '$MEDIA_DIR/build/media.vcproj',
-                    '$TESTING_DIR/gtest.vcproj',
-                ],
-                guid='{C8C6183C-B03C-11DD-B471-DFD256D89593}')
+p = env.ChromeMSVSProject('build/media_unittests.vcproj',
+                          dest=('$CHROME_SRC_DIR/media/' +
+                                    'build/media_unittests.vcproj'),
+                          guid='{C8C6183C-B03C-11DD-B471-DFD256D89593}',
+                          keyword='Win32Proj',
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              MSVSTool('VCCLCompilerTool',
+                                        PreprocessorDefinitions='UNIT_TEST'),
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              'VCLinkerTool',
+                              'VCALinkTool',
+                              'VCManifestTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCAppVerifierTool',
+                              'VCWebDeploymentTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='1')
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/debug.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/release.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+            ])
diff --git a/rlz/SConscript b/rlz/SConscript
index 75c2ea7..1753fe7 100644
--- a/rlz/SConscript
+++ b/rlz/SConscript
@@ -4,9 +4,42 @@
 
 Import('env')
 
+input_files = ChromeFileList([
+    'binaries/rlz.dll',
+    'binaries/rlz_dll.pdb',
+])
+
+# TODO(sgk):  derive from above ChromeFileList object.
 env.Install('$TARGET_ROOT',
             ['binaries/rlz.dll',
              'binaries/rlz_dll.pdb'])
 
-env.ChromeMSVSProject('$RLZ_DIR/rlz.vcproj',
-                guid='{BF4F447B-72B5-4059-BE1B-F94337B1F385}')
+p = env.ChromeMSVSProject('rlz.vcproj',
+                          dest='$CHROME_SRC_DIR/rlz/rlz.vcproj',
+                          guid='{BF4F447B-72B5-4059-BE1B-F94337B1F385}',
+                          keyword='Win32Proj',
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'Output RLZ copy',
+                              'VCCustomBuildTool',
+                              'VCMIDLTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='10')
+
+# TODO(sgk):  remove once SCons drives build
+p.AddToolFile('./output_rlz_copy.rules')
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/debug.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/release.vsprops',
+            ])
diff --git a/rlz/rlz.vcproj b/rlz/rlz.vcproj
index 560ada7..04f0643 100644
--- a/rlz/rlz.vcproj
+++ b/rlz/rlz.vcproj
@@ -14,7 +14,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath=".\output_rlz_copy.rules"
+			RelativePath="output_rlz_copy.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
diff --git a/sdch/SConscript b/sdch/SConscript
index 64ac0e2..2ab22b9f 100644
--- a/sdch/SConscript
+++ b/sdch/SConscript
@@ -17,26 +17,48 @@ if env.Bit('windows'):
 
 env.Prepend(CPPPATH = cpppath)
 
-input_files = [
-    '$OPEN_VCDIFF_DIR/src/addrcache.cc',
-    '$OPEN_VCDIFF_DIR/src/adler32.c',
-    '$OPEN_VCDIFF_DIR/src/blockhash.cc',
-    '$OPEN_VCDIFF_DIR/src/codetable.cc',
-    '$OPEN_VCDIFF_DIR/src/decodetable.cc',
-    '$OPEN_VCDIFF_DIR/src/encodetable.cc',
-    '$OPEN_VCDIFF_DIR/src/headerparser.cc',
-    '$OPEN_VCDIFF_DIR/src/instruction_map.cc',
-    '$OPEN_VCDIFF_DIR/src/logging.cc',
-    '$OPEN_VCDIFF_DIR/src/varint_bigendian.cc',
-    '$OPEN_VCDIFF_DIR/src/vcdecoder.cc',
-    '$OPEN_VCDIFF_DIR/src/vcdiffengine.cc',
-]
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('Header Files', [
+    'open-vcdiff/src/blockhash.h',
+    'open-vcdiff/src/checksum.h',
+    'open-vcdiff/src/codetable.h',
+    'open-vcdiff/src/compile_assert.h',
+    'open-vcdiff/vsprojects/config.h',
+    'open-vcdiff/src/decodetable.h',
+    'open-vcdiff/src/encodetable.h',
+    'open-vcdiff/src/headerparser.h',
+    'open-vcdiff/src/logging.h',
+    'open-vcdiff/src/google/output_string.h',
+    'open-vcdiff/src/rolling_hash.h',
+    'open-vcdiff/vsprojects/stdint.h',
+    'open-vcdiff/src/testing.h',
+    'open-vcdiff/src/varint_bigendian.h',
+    'open-vcdiff/src/google/vcdecoder.h',
+    'open-vcdiff/src/vcdiff_defs.h',
+    'open-vcdiff/src/vcdiffengine.h',
+    'open-vcdiff/src/zconf.h',
+    'open-vcdiff/src/zlib.h',
+  ]),
+  MSVSFilter('Source Files', [
+    'open-vcdiff/src/addrcache.cc',
+    'open-vcdiff/src/adler32.c',
+    'open-vcdiff/src/blockhash.cc',
+    'open-vcdiff/src/codetable.cc',
+    'open-vcdiff/src/decodetable.cc',
+    'open-vcdiff/src/encodetable.cc',
+    'open-vcdiff/src/headerparser.cc',
+    'open-vcdiff/src/logging.cc',
+    'open-vcdiff/src/varint_bigendian.cc',
+    'open-vcdiff/src/vcdecoder.cc',
+    'open-vcdiff/src/vcdiffengine.cc',
+  ]),
+])
 
 env.ChromeLibrary('sdch', input_files)
 
-env.ChromeMSVSProject('$SDCH_DIR/sdch.vcproj',
-                guid='{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}')
-
 if env.Bit('posix'):
 
   # Generate a target config.h file from a source config.h.in file.
@@ -124,3 +146,50 @@ if env.Bit('posix'):
               '$OPEN_VCDIFF_DIR/src/config.h.in',
               Action(AutoConfig, varlist=['DEFINES']),
               DEFINES=defines)
+
+
+p = env.ChromeMSVSProject('sdch.vcproj',
+                          dest='$CHROME_SRC_DIR/sdch/sdch.vcproj',
+                          guid='{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}',
+                          keyword='Win32Proj',
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          relative_path_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              MSVSTool('VCCLCompilerTool',
+                                       AdditionalIncludeDirectories=[
+                                           './open-vcdiff/vsprojects',
+                                           '',
+                                       ],
+                                       DefaultCharIsUnsigned="true"),
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              'VCLibrarianTool',
+                              'VCALinkTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='4')
+
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/debug.vsprops',
+                '$(SolutionDir)../sdch/using_sdch.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/release.vsprops',
+                '$(SolutionDir)../sdch/using_sdch.vsprops',
+            ])
diff --git a/sdch/sdch.vcproj b/sdch/sdch.vcproj
index 91a9564..76a43c9 100644
--- a/sdch/sdch.vcproj
+++ b/sdch/sdch.vcproj
@@ -4,6 +4,7 @@
 	Version="8.00"
 	Name="sdch"
 	ProjectGUID="{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}"
+	RootNamespace="sdch"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -36,7 +37,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="./open-vcdiff/vsprojects;"
+				AdditionalIncludeDirectories=".\open-vcdiff\vsprojects;"
 				DefaultCharIsUnsigned="true"
 			/>
 			<Tool
@@ -89,7 +90,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="./open-vcdiff/vsprojects;"
+				AdditionalIncludeDirectories=".\open-vcdiff\vsprojects;"
 				DefaultCharIsUnsigned="true"
 			/>
 			<Tool
@@ -126,8 +127,6 @@
 	<Files>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{5612E1F3-EC29-4848-8301-B23786CED3CA}"
 			>
 			<File
 				RelativePath=".\open-vcdiff\src\blockhash.h"
@@ -208,8 +207,6 @@
 		</Filter>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{883D491D-EF73-4c2f-BB09-6F87DC95DC28}"
 			>
 			<File
 				RelativePath=".\open-vcdiff\src\addrcache.cc"