From 685454d925ea207d0ae8600746214dfa08f099e2 Mon Sep 17 00:00:00 2001
From: "mpcomplete@chromium.org"
 <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 2 Dec 2008 21:37:42 +0000
Subject: Add launch_url to gears-scons build. Review URL:
 http://codereview.chromium.org/12879

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6243 0039d316-1c4b-4281-b951-d872f2087c98
---
 gears/SConscript.common     |  6 ++++++
 gears/SConscript.inputs     |  7 +++++++
 gears/SConscript.installers | 11 +++++++----
 3 files changed, 20 insertions(+), 4 deletions(-)

(limited to 'gears')

diff --git a/gears/SConscript.common b/gears/SConscript.common
index ce6d9e90..773f50a 100644
--- a/gears/SConscript.common
+++ b/gears/SConscript.common
@@ -90,6 +90,12 @@ if env['OS'] == 'osx':
       FRAMEWORKS = env['FRAMEWORKS'] + ['Carbon'],
       LIBS = env['LIBS'] + ['breakpad_osx-gears'])
 
+  outputs['OSX_LAUNCHURL_EXE'] = env.ChromeProgram('launch_url_with_browser',
+      GetInputs('$OSX_LAUNCHURL_CPPSRCS'),
+      FRAMEWORKS = env['FRAMEWORKS'] +
+          Split('CoreFoundation ApplicationServices'),
+      LIBS = env['LIBS'] + ['stdc++'])
+
   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 12f914d..d6accaa 100755
--- a/gears/SConscript.inputs
+++ b/gears/SConscript.inputs
@@ -46,6 +46,13 @@ elif env['OS'] == 'osx':
   ])
 
 #-----------------------------------------------------------------------------
+# launch_url_with_browser
+
+env.Append(OSX_LAUNCHURL_CPPSRCS = [
+    '$OPEN_DIR/base/safari/launch_url_in_browser.cc',
+])
+
+#-----------------------------------------------------------------------------
 # ipc_test
 
 env.Append(COMMON_M4SRCS = [
diff --git a/gears/SConscript.installers b/gears/SConscript.installers
index d59e86c..c528985 100644
--- a/gears/SConscript.installers
+++ b/gears/SConscript.installers
@@ -213,7 +213,10 @@ def FirefoxInstaller():
         ('components/gears_ff2.pdb', ['$FF2_MODULE_PDB']),
         ('components/gears.pdb', ['$FF3_MODULE_PDB']),
     ]
-  # TODO: launchurl
+  if env['OS'] == 'osx':
+    dirsrcs += [
+        ('resources/', ['$OSX_LAUNCHURL_EXE']),
+    ]
 
   dir = env.DirBuilder('$INSTALLER_OUTDIR/$INSTALLER_BASENAME', dirsrcs)
   actions = [
@@ -270,9 +273,9 @@ 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/Resources/', ['$CRASH_SENDER_EXE']),
+      ('Contents/Resources/', ['$OSX_CRASH_INSPECTOR_EXE']),
+      ('Contents/Resources/', ['$OSX_LAUNCHURL_EXE']),
       ('Contents/MacOS/', ['$SF_MODULE']), 
   ]
 
-- 
cgit v1.1