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

4 files changed, 195 insertions, 29 deletions

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',
+            ])