Add crash_sender and crash_inspector to Safari gears-scons build.

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

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

3 files changed, 36 insertions, 11 deletions

diff --git a/gears/SConscript.common b/gears/SConscript.common
index 47ad2bd..ce6d9e90 100644
--- a/gears/SConscript.common
+++ b/gears/SConscript.common
@@ -73,13 +73,23 @@ if env['OS'] == 'win32':
       GetInputs('$CRASH_SENDER_CPPSRCS'),
       LIBS = Split('advapi32.lib shell32.lib wininet.lib'))
 elif env['OS'] == 'osx':
-  pass
-  # crash_sender = env.Program('crash_sender', crash_sender_srcs,
-  #     FRAMEWORKS = Split('Carbon Cocoa Foundation IOKit SystemConfiguration'),
-  #     LIBS='stdc++')
+  outputs['CRASH_SENDER_EXE'] = env.ChromeProgram('crash_sender',
+      GetInputs('$CRASH_SENDER_CPPSRCS'),
+      FRAMEWORKS = env['FRAMEWORKS'] +
+          Split('Carbon Cocoa Foundation IOKit SystemConfiguration'),
+      LIBS = env['LIBS'] + ['crypto', 'stdc++'])
 env.Alias('gears', outputs['CRASH_SENDER_EXE'])
 
 if env['OS'] == 'osx':
+# Crash inspector is launched by the crashed process from it's exception
+# handler and is what actually communicates with the crashed process to
+# extract the minidump.  It then launches crash_sender in order to actually
+# send the minidump over the wire.
+  outputs['OSX_CRASH_INSPECTOR_EXE'] = env.ChromeProgram('crash_inspector',
+      GetInputs('$OSX_CRASH_INSPECTOR_CPPSRCS'),
+      FRAMEWORKS = env['FRAMEWORKS'] + ['Carbon'],
+      LIBS = env['LIBS'] + ['breakpad_osx-gears'])
+
   outputs['SF_INSTALLER_PLUGIN_EXE'] = env.ChromeSharedLibrary('stats_pane',
       GetInputs('$SF_INSTALLER_PLUGIN_CPPSRCS'),
       FRAMEWORKS = env['FRAMEWORKS'] + Split('Cocoa InstallerPlugins'))
diff --git a/gears/SConscript.inputs b/gears/SConscript.inputs
index 510856e..12f914d 100755
--- a/gears/SConscript.inputs
+++ b/gears/SConscript.inputs
@@ -31,7 +31,19 @@ if env['OS'] == 'win32':
       '$THIRD_PARTY_DIR/breakpad/src/common/windows/http_upload.cc',
   ])
 elif env['OS'] == 'osx':
-  print 'TODO: crash_sender'
+  env.Append(CRASH_SENDER_CPPSRCS = [
+      '$OPEN_DIR/base/common/exception_handler_osx/nshost_macaddress.m',
+      '$OPEN_DIR/crash_sender/crash_sender_osx.m',
+      '$THIRD_PARTY_DIR/breakpad/src/common/mac/HTTPMultipartUpload.m',
+  ])
+
+  env.Append(OSX_CRASH_INSPECTOR_CPPSRCS = [
+      '$THIRD_PARTY_DIR/breakpad_osx/src/common/convert_UTF.c',
+      '$OPEN_DIR/base/common/exception_handler_osx/inspector.mm',
+      '$OPEN_DIR/base/common/exception_handler_osx/mach_ipc.mm',
+      '$OPEN_DIR/base/common/exception_handler_osx/on_demand_server.mm',
+      '$OPEN_DIR/base/common/exception_handler_osx/simple_string_dictionary.mm',
+  ])
 
 #-----------------------------------------------------------------------------
 # ipc_test
@@ -155,12 +167,13 @@ if env['OS'] == 'win32':
 
 #-----------------------------------------------------------------------------
 # third_party/breakpad_osx
+
 env.Append(SF_CPPSRCS = [
-     '$OPEN_DIR/base/common/exception_handler_osx.mm',
-     '$OPEN_DIR/base/common/exception_handler_osx/google_breakpad.mm',
-     '$OPEN_DIR/base/common/exception_handler_osx/mach_ipc.mm',
-     '$OPEN_DIR/base/common/exception_handler_osx/on_demand_server.mm',
-     '$OPEN_DIR/base/common/exception_handler_osx/simple_string_dictionary.mm'
+    '$OPEN_DIR/base/common/exception_handler_osx.mm',
+    '$OPEN_DIR/base/common/exception_handler_osx/google_breakpad.mm',
+    '$OPEN_DIR/base/common/exception_handler_osx/mach_ipc.mm',
+    '$OPEN_DIR/base/common/exception_handler_osx/on_demand_server.mm',
+    '$OPEN_DIR/base/common/exception_handler_osx/simple_string_dictionary.mm'
 ])
 
 #-----------------------------------------------------------------------------
diff --git a/gears/SConscript.installers b/gears/SConscript.installers
index d72324a..d59e86c 100644
--- a/gears/SConscript.installers
+++ b/gears/SConscript.installers
@@ -213,7 +213,7 @@ def FirefoxInstaller():
         ('components/gears_ff2.pdb', ['$FF2_MODULE_PDB']),
         ('components/gears.pdb', ['$FF3_MODULE_PDB']),
     ]
-  # TODO: notifier, os x
+  # TODO: launchurl
 
   dir = env.DirBuilder('$INSTALLER_OUTDIR/$INSTALLER_BASENAME', dirsrcs)
   actions = [
@@ -270,6 +270,8 @@ def SafariPluginBundle():
       ('Contents/Resources/English.lproj/InfoPlist.strings',
           ['$OPEN_DIR/tools/osx/English.lproj/InfoPlist.strings']),
       ('Contents/Resources/', env.Glob('#/$OPEN_DIR/ui/safari/*.nib')),
+      ('Contents/Resources/', '$CRASH_SENDER_EXE'),
+      ('Contents/Resources/', '$OSX_CRASH_INSPECTOR_EXE'),
       # TODO(mpcomplete): crash sendor/inspector, launchurl
       ('Contents/MacOS/', ['$SF_MODULE']), 
   ]