diff options
| author | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-06 22:45:50 +0000 |
|---|---|---|
| committer | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-06 22:45:50 +0000 |
| commit | 17ee3a0708898be179820aa17482b803ef549632 (patch) | |
| tree | d3369a5b0cff3f1d997f6b4088ebd43481debcf5 /gears/SConscript.installers | |
| parent | d8e70b4ea21e505f0e784fdef8f7c36ab619d7d8 (diff) | |
| download | chromium_src-17ee3a0708898be179820aa17482b803ef549632.zip chromium_src-17ee3a0708898be179820aa17482b803ef549632.tar.gz chromium_src-17ee3a0708898be179820aa17482b803ef549632.tar.bz2 | |
Change the way inputs are specified in the gears sconscripts. This will make
it easier to share inputs among files, in preparation for the symbian port.
Also, some small fixes:
- Added a hack to the third party lib scripts to place the libraries in the
right directory. Normally SCons does this, but fails due to a bug when
COMPONENT_LIBRARY_DIR is changed.
- Added fake notifier targets to make the win32 installer happy.
- Added NPAPI's gears.dll to the win32 installer dependencies, so it is built (even though it isn't used by the installer).
- Added symbian file to sqlite compile.
Review URL: http://codereview.chromium.org/9657
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4921 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gears/SConscript.installers')
| -rw-r--r-- | gears/SConscript.installers | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/gears/SConscript.installers b/gears/SConscript.installers index 513a01f..f755420 100644 --- a/gears/SConscript.installers +++ b/gears/SConscript.installers @@ -231,10 +231,21 @@ def Win32Installer(env): StripOutdir(['$COMMON_GENFILES_DIR/win32_msi.wxiobj']), StripOutdir(['$COMMON_GENFILES_DIR/win32_msi.wxs']), '$CANDLECOM') + # TODO(mpcomplete): remove this if/when the notifier goes away. This + # creates fake targets to satisfy the installer build. + notifier = env.Command( + StripOutdir([ + '$COMMON_OUTDIR/notifier.exe', + '$COMMON_OUTDIR/notifier.dll', + '$COMMON_OUTDIR/notifier_test.exe' + ]), [], + 'touch $TARGETS') # light.exe must be run from $OPEN_DIR msi = env.Command( '$WIN32_INSTALLER_MSI', - [wxiobj, '$FF_XPI', StripOutdir(['$IE_OUTDIR/$MODULE'])], + [wxiobj, notifier, '$FF_XPI', + StripOutdir(['$IE_OUTDIR/$MODULE']), + StripOutdir(['$NPAPI_OUTDIR/$MODULE'])], 'cd $OPEN_DIR && light.exe -out ${TARGET.abspath} ${SOURCES[0].abspath}') return msi env.AddMethod(Win32Installer, 'Win32Installer') |