Moving all the breakpad stuff to: src/breakpad

(out of build/temp_gyp)

Review URL: http://codereview.chromium.org/113352

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

3 files changed, 195 insertions, 379 deletions

diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp
index e661ff7..648b910 100644
--- a/breakpad/breakpad.gyp
+++ b/breakpad/breakpad.gyp
@@ -2,144 +2,208 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# This only builds the Mac version of Breakpad for now.
-
 {
   'includes': [
     '../build/common.gypi',
   ],
-  'target_defaults': {
-    'include_dirs': [
-      'src/',
-    ],
-    'configurations': {
-      'Debug': {
-        'defines': [
-          # This is needed for GTMLogger to work correctly.
-          'DEBUG',
+  'conditions': [
+    [ 'OS=="mac"', {
+      'target_defaults': {
+        'include_dirs': [
+          'src/',
         ],
+        'configurations': {
+          'Debug': {
+            'defines': [
+              # This is needed for GTMLogger to work correctly.
+              'DEBUG',
+            ],
+          },
+        },
       },
-    },
-  },
-  'targets': [
-    {
-      'target_name': 'breakpad_utilities',
-      'type': '<(library)',
-      'sources': [
-        'src/common/convert_UTF.c',
-        'src/client/mac/handler/dynamic_images.cc',
-        'src/common/mac/file_id.cc',
-        'src/common/mac/MachIPC.mm',
-        'src/common/mac/macho_id.cc',
-        'src/common/mac/macho_utilities.cc',
-        'src/common/mac/macho_walker.cc',
-        'src/client/minidump_file_writer.cc',
-        'src/client/mac/handler/minidump_generator.cc',
-        'src/common/mac/SimpleStringDictionary.mm',
-        'src/common/string_conversion.cc',
-        'src/common/mac/string_utilities.cc',
-      ],
-      'link_settings': {
-        'libraries': ['$(SDKROOT)/usr/lib/libcrypto.dylib'],
-      }
-    },
-    {
-      'target_name': 'crash_inspector',
-      'type': 'executable',
-      'dependencies': [
-        'breakpad_utilities',
-      ],
-      'sources': [
-        'src/client/mac/crash_generation/Inspector.mm',
-        'src/client/mac/crash_generation/InspectorMain.mm',
-      ],
-      'link_settings': {
-        'libraries': [
-          '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
-        ],
-      }
-    },
-    {
-      'target_name': 'crash_report_sender',
-      'type': 'executable',
-      'mac_bundle': 1,
-      'sources': [
-        'src/common/mac/HTTPMultipartUpload.m',
-        'src/client/mac/sender/crash_report_sender.m',
-        'src/common/mac/GTMLogger.m',
-      ],
-      'mac_bundle_resources': [
-        'src/client/mac/sender/English.lproj/Localizable.strings',
-        'src/client/mac/sender/crash_report_sender.icns',
-        'src/client/mac/sender/English.lproj/Breakpad.nib',
-        'src/client/mac/sender/crash_report_sender-Info.plist',
-      ],
-      'mac_bundle_resources!': [
-         'src/client/mac/sender/crash_report_sender-Info.plist',
-      ],
-      'xcode_settings': {
-         'INFOPLIST_FILE': 'src/client/mac/sender/crash_report_sender-Info.plist',
-      },
-      'link_settings': {
-        'libraries': [
-          '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
-          '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
-          '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framework',
-        ],
-      }
-    },
-    {
-      'target_name': 'dump_syms',
-      'type': 'executable',
-      'include_dirs': [
-        'src/common/mac',
-      ],
-      'dependencies': [
-        'breakpad_utilities',
-      ],
-      'sources': [
-        'src/common/mac/dwarf/bytereader.cc',
-        'src/common/mac/dwarf/dwarf2reader.cc',
-        'src/common/mac/dwarf/functioninfo.cc',
-        'src/common/mac/dump_syms.mm',
-        'src/tools/mac/dump_syms/dump_syms_tool.mm',
-      ],
-      'link_settings': {
-        'libraries': [
-          '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
-        ],
-      }
-    },
-    {
-      'target_name': 'symupload',
-      'type': 'executable',
-      'include_dirs': [
-        'src/common/mac',
-      ],
-      'sources': [
-        'src/common/mac/HTTPMultipartUpload.m',
-        'src/tools/mac/symupload/symupload.m',
-      ],
-      'link_settings': {
-        'libraries': [
-          '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
-        ],
-      }
-    },
-    {
-      'target_name': 'breakpad',
-      'type': '<(library)',
-      'dependencies': [
-        'breakpad_utilities',
-        'crash_inspector',
-        'crash_report_sender',
+      'targets': [
+        {
+          'target_name': 'breakpad_utilities',
+          'type': '<(library)',
+          'sources': [
+            'src/common/convert_UTF.c',
+            'src/client/mac/handler/dynamic_images.cc',
+            'src/common/mac/file_id.cc',
+            'src/common/mac/MachIPC.mm',
+            'src/common/mac/macho_id.cc',
+            'src/common/mac/macho_utilities.cc',
+            'src/common/mac/macho_walker.cc',
+            'src/client/minidump_file_writer.cc',
+            'src/client/mac/handler/minidump_generator.cc',
+            'src/common/mac/SimpleStringDictionary.mm',
+            'src/common/string_conversion.cc',
+            'src/common/mac/string_utilities.cc',
+          ],
+          'link_settings': {
+            'libraries': ['$(SDKROOT)/usr/lib/libcrypto.dylib'],
+          }
+        },
+        {
+          'target_name': 'crash_inspector',
+          'type': 'executable',
+          'dependencies': [
+            'breakpad_utilities',
+          ],
+          'sources': [
+            'src/client/mac/crash_generation/Inspector.mm',
+            'src/client/mac/crash_generation/InspectorMain.mm',
+          ],
+          'link_settings': {
+            'libraries': [
+              '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
+            ],
+          }
+        },
+        {
+          'target_name': 'crash_report_sender',
+          'type': 'executable',
+          'mac_bundle': 1,
+          'sources': [
+            'src/common/mac/HTTPMultipartUpload.m',
+            'src/client/mac/sender/crash_report_sender.m',
+            'src/common/mac/GTMLogger.m',
+          ],
+          'mac_bundle_resources': [
+            'src/client/mac/sender/English.lproj/Localizable.strings',
+            'src/client/mac/sender/crash_report_sender.icns',
+            'src/client/mac/sender/English.lproj/Breakpad.nib',
+            'src/client/mac/sender/crash_report_sender-Info.plist',
+          ],
+          'mac_bundle_resources!': [
+             'src/client/mac/sender/crash_report_sender-Info.plist',
+          ],
+          'xcode_settings': {
+             'INFOPLIST_FILE': 'src/client/mac/sender/crash_report_sender-Info.plist',
+          },
+          'link_settings': {
+            'libraries': [
+              '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
+              '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
+              '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framework',
+            ],
+          }
+        },
+        {
+          'target_name': 'dump_syms',
+          'type': 'executable',
+          'include_dirs': [
+            'src/common/mac',
+          ],
+          'dependencies': [
+            'breakpad_utilities',
+          ],
+          'sources': [
+            'src/common/mac/dwarf/bytereader.cc',
+            'src/common/mac/dwarf/dwarf2reader.cc',
+            'src/common/mac/dwarf/functioninfo.cc',
+            'src/common/mac/dump_syms.mm',
+            'src/tools/mac/dump_syms/dump_syms_tool.mm',
+          ],
+          'link_settings': {
+            'libraries': [
+              '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
+            ],
+          }
+        },
+        {
+          'target_name': 'symupload',
+          'type': 'executable',
+          'include_dirs': [
+            'src/common/mac',
+          ],
+          'sources': [
+            'src/common/mac/HTTPMultipartUpload.m',
+            'src/tools/mac/symupload/symupload.m',
+          ],
+          'link_settings': {
+            'libraries': [
+              '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
+            ],
+          }
+        },
+        {
+          'target_name': 'breakpad',
+          'type': '<(library)',
+          'dependencies': [
+            'breakpad_utilities',
+            'crash_inspector',
+            'crash_report_sender',
+          ],
+          'sources': [
+            'src/client/mac/handler/protected_memory_allocator.cc',
+            'src/client/mac/handler/exception_handler.cc',
+            'src/client/mac/Framework/Breakpad.mm',
+            'src/client/mac/Framework/OnDemandServer.mm',
+          ],
+        },
       ],
-      'sources': [
-        'src/client/mac/handler/protected_memory_allocator.cc',
-        'src/client/mac/handler/exception_handler.cc',
-        'src/client/mac/Framework/Breakpad.mm',
-        'src/client/mac/Framework/OnDemandServer.mm',
+    }],
+    [ 'OS=="win"', {
+      'targets': [
+        {
+          'target_name': 'breakpad_handler',
+          'type': '<(library)',
+          'msvs_guid': 'B55CA863-B374-4BAF-95AC-539E4FA4C90C',
+          'sources': [
+            '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',
+          ],
+          'include_dirs': [
+            'src',
+          ],
+          'link_settings': {
+            'libraries': [
+              '-lurlmon.lib',
+            ],
+          },
+          'direct_dependent_settings': {
+            'include_dirs': [
+              'src',
+            ],
+          },
+        },
+        {
+          'target_name': 'breakpad_sender',
+          'type': '<(library)',
+          'msvs_guid': '9946A048-043B-4F8F-9E07-9297B204714C',
+          'sources': [
+            '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',
+          ],
+          'include_dirs': [
+            'src',
+          ],
+          'link_settings': {
+            'libraries': [
+              '-lurlmon.lib',
+            ],
+          },
+          'direct_dependent_settings': {
+            'include_dirs': [
+              'src',
+            ],
+          },
+        },
       ],
-    },
+    }],
   ],
 }
diff --git a/breakpad/breakpad_handler.vcproj b/breakpad/breakpad_handler.vcproj
deleted file mode 100644
index 422b552..0000000
--- a/breakpad/breakpad_handler.vcproj
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="breakpad_handler"
-	ProjectGUID="{B55CA863-B374-4BAF-95AC-539E4FA4C90C}"
-	RootNamespace="breakpad_handler"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops;$(SolutionDir)..\build\external_code.vsprops;.\using_breakpad.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops;$(SolutionDir)..\build\external_code.vsprops;.\using_breakpad.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="src\client\windows\crash_generation\client_info.cc"
-			>
-		</File>
-		<File
-			RelativePath="src\client\windows\crash_generation\client_info.h"
-			>
-		</File>
-		<File
-			RelativePath="src\client\windows\crash_generation\crash_generation_client.cc"
-			>
-		</File>
-		<File
-			RelativePath="src\client\windows\crash_generation\crash_generation_client.h"
-			>
-		</File>
-		<File
-			RelativePath="src\client\windows\crash_generation\crash_generation_server.cc"
-			>
-		</File>
-		<File
-			RelativePath="src\client\windows\crash_generation\crash_generation_server.h"
-			>
-		</File>
-		<File
-			RelativePath="src\client\windows\handler\exception_handler.cc"
-			>
-		</File>
-		<File
-			RelativePath="src\client\windows\handler\exception_handler.h"
-			>
-		</File>
-		<File
-			RelativePath="src\common\windows\guid_string.cc"
-			>
-		</File>
-		<File
-			RelativePath="src\common\windows\guid_string.h"
-			>
-		</File>
-		<File
-			RelativePath="src\google_breakpad\common\minidump_format.h"
-			>
-		</File>
-		<File
-			RelativePath="src\client\windows\crash_generation\minidump_generator.cc"
-			>
-		</File>
-		<File
-			RelativePath="src\client\windows\crash_generation\minidump_generator.h"
-			>
-		</File>
-		<File
-			RelativePath="src\common\windows\string_utils-inl.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/breakpad/breakpad_sender.vcproj b/breakpad/breakpad_sender.vcproj
deleted file mode 100644
index 569e746..0000000
--- a/breakpad/breakpad_sender.vcproj
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="breakpad_sender"
-	ProjectGUID="{9946A048-043B-4F8F-9E07-9297B204714C}"
-	RootNamespace="breakpad_sender"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops;$(SolutionDir)..\build\external_code.vsprops;using_breakpad.vsprops"
-			>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops;$(SolutionDir)..\build\external_code.vsprops;using_breakpad.vsprops"
-			>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="src\client\windows\sender\crash_report_sender.cc"
-			>
-		</File>
-		<File
-			RelativePath="src\common\windows\http_upload.cc"
-			>
-		</File>
-		<File
-			RelativePath="src\client\windows\sender\crash_report_sender.h"
-			>
-		</File>
-		<File
-			RelativePath="src\common\windows\http_upload.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>