diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-10 00:01:37 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-10 00:01:37 +0000 |
| commit | 6b3531280db5c7a6080dee26a0637553ca4af642 (patch) | |
| tree | e724570c5bc35a7fa5315b7245f2b695683fdb8c /gears/SConscript.installers | |
| parent | 32cda29d0266751c764b043d8aaec6dccc646e29 (diff) | |
| download | chromium_src-6b3531280db5c7a6080dee26a0637553ca4af642.zip chromium_src-6b3531280db5c7a6080dee26a0637553ca4af642.tar.gz chromium_src-6b3531280db5c7a6080dee26a0637553ca4af642.tar.bz2 | |
Pull 'common' outputs out into their own SConscript so they have their own
variant dir. Add ipc_test as a common output.
Also fixed up some hackery around manipulating OUTDIRs.
Review URL: http://codereview.chromium.org/7037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3158 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gears/SConscript.installers')
| -rw-r--r-- | gears/SConscript.installers | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/gears/SConscript.installers b/gears/SConscript.installers index 9d81681..bf73301 100644 --- a/gears/SConscript.installers +++ b/gears/SConscript.installers @@ -17,17 +17,16 @@ env = env.Clone( FF2_MODULE = '${SHLIBPREFIX}gears_ff2${SHLIBSUFFIX}', MODULE = '${SHLIBPREFIX}gears${SHLIBSUFFIX}', - # Qualify our OUTDIRs relative to the SConscript files. This is for use - # with Copy(), which runs from that dir. - BASE_OUTDIR = env.Entry('$GEARS_DIR/$BASE_OUTDIR').path, + # Clean up the '#' in *_OUTDIR. + BASE_OUTDIR = env.Entry('$BASE_OUTDIR').path, ) ff3_resources = [ - '$FF3_OUTDIR/$GENFILES_DIR/browser-overlay.js', - '$FF3_OUTDIR/$GENFILES_DIR/browser-overlay.xul', - '$FF3_OUTDIR/$GENFILES_DIR/permissions_dialog.html', - '$FF3_OUTDIR/$GENFILES_DIR/settings_dialog.html', - '$FF3_OUTDIR/$GENFILES_DIR/shortcuts_dialog.html', + '$FF3_OUTDIR/genfiles/browser-overlay.js', + '$FF3_OUTDIR/genfiles/browser-overlay.xul', + '$FF3_OUTDIR/genfiles/permissions_dialog.html', + '$FF3_OUTDIR/genfiles/settings_dialog.html', + '$FF3_OUTDIR/genfiles/shortcuts_dialog.html', ] common_resources = [ @@ -165,13 +164,14 @@ def FirefoxInstaller(env): # Note: as shorthand, if the target ends with a '/', then the sources will # be placed into that dir. Otherwise, source is renamed into the target. copysrcs = [ - ('/', ['$FF3_OUTDIR/$GENFILES_DIR/install.rdf', - '$FF3_OUTDIR/$GENFILES_DIR/chrome.manifest']), + ('/', ['$FF3_OUTDIR/genfiles/install.rdf', + '$FF3_OUTDIR/genfiles/chrome.manifest']), ('lib/', ['$OPEN_DIR/base/firefox/static_files/lib/updater.js']), ('chrome/chromeFiles/content/', ff3_resources + common_resources), - ('chrome/chromeFiles/locale', ['$FF3_OUTDIR/$GENFILES_DIR/i18n']), + ('chrome/chromeFiles/locale', ['$FF3_OUTDIR/genfiles/i18n']), ('components/', ['$FF3_OUTDIR/gears.xpt', + '$COMMON_OUTDIR/ipc_test${PROGSUFFIX}', '$OPEN_DIR/base/firefox/static_files/components/bootstrap.js']), ('components/$FF2_MODULE', ['$FF2_OUTDIR/$MODULE']), ('components/$MODULE', ['$FF3_OUTDIR/$MODULE']), @@ -215,8 +215,8 @@ env.AddMethod(FirefoxInstaller, 'FirefoxInstaller') def Win32Installer(env): wxiobj = env.Command( - StripOutdir(['$IE_OUTDIR/$GENFILES_DIR/win32_msi.wxiobj']), - StripOutdir(['$IE_OUTDIR/$GENFILES_DIR/win32_msi.wxs']), + StripOutdir(['$COMMON_GENFILES_DIR/win32_msi.wxiobj']), + StripOutdir(['$COMMON_GENFILES_DIR/win32_msi.wxs']), '$CANDLECOM') # light.exe must be run from $OPEN_DIR msi = env.Command('$WIN32_INSTALLER_MSI', wxiobj, |