diff options
| -rw-r--r-- | gears/SConscript.common | 6 | ||||
| -rwxr-xr-x | gears/SConscript.inputs | 7 | ||||
| -rw-r--r-- | gears/SConscript.installers | 11 |
3 files changed, 20 insertions, 4 deletions
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']), ] |