diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-19 22:38:46 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-19 22:38:46 +0000 |
| commit | f3f568b18078fa29f9b84cd66bd2d1029ce408a1 (patch) | |
| tree | 2c1beb150a62dfce10470a5b2d922336611eb136 /gears/SConscript.common | |
| parent | 9eb12d18f96a72d8fa6d04988ea01448af2385a6 (diff) | |
| download | chromium_src-f3f568b18078fa29f9b84cd66bd2d1029ce408a1.zip chromium_src-f3f568b18078fa29f9b84cd66bd2d1029ce408a1.tar.gz chromium_src-f3f568b18078fa29f9b84cd66bd2d1029ce408a1.tar.bz2 | |
Some cleanup work I did while adding more Safari builders. It got to be
extensive so I decided to just check it in.
Changes:
- Use Return() instead of Export() from SConscript.inputs to pass 'env' back.
- Move some of the build vars around to fix builders that aren't in
SConscript.browser.
- Refactor SConscript.installers so that we now have DirBuilder, a generic
builder that creates a directory tree (used to be FF-specific). This will be
used for OSX bundles.
Review URL: http://codereview.chromium.org/11261
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5722 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gears/SConscript.common')
| -rw-r--r-- | gears/SConscript.common | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/gears/SConscript.common b/gears/SConscript.common index 4c6ad5c..5df142b 100644 --- a/gears/SConscript.common +++ b/gears/SConscript.common @@ -35,10 +35,14 @@ env.Prepend( ] ) +# OS X needs to be 'LINUX' in common sources. +# TODO(nigeltao): Should we instead have a UNIX flag, rather than calling +# Mac OS X a "flavor of Linux"?? +if env['OS'] == 'osx': + env.Append(CPPDEFINES = ['LINUX']) + # Include the input file list. -env.SConscript('SConscript.inputs', exports={'env': env, 'env_res': None}) -Import('env_inputs') -env = env_inputs +env = env.SConscript('SConscript.inputs', exports={'env': env, 'env_res': None}) #----------------------------------------------------------------------------- @@ -80,3 +84,9 @@ elif env['OS'] == 'osx': # FRAMEWORKS = Split('Carbon Cocoa Foundation IOKit SystemConfiguration'), # LIBS='stdc++') env.Alias('gears', crash_sender) + +if env['OS'] == 'osx': + # SF_INSTALLER_PLUGIN_EXE + env.ChromeProgram('stats_pane', + GetInputs('$SF_INSTALLER_PLUGIN_CPPSRCS'), + FRAMEWORKS = env['FRAMEWORKS'] + Split('Cocoa InstallerPlugins')) |