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

5 files changed, 182 insertions, 56 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>