diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-31 20:58:34 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-31 20:58:34 +0000 |
| commit | ae607dc8ef50d1ccdbc459d3793f9c6b40408dd7 (patch) | |
| tree | 865833372db3f4c6cf9e3824206ec19db7d46aaf /chrome/installer | |
| parent | c4269ebd7bdebacfdbd375a7db135c641b6cbd3e (diff) | |
| download | chromium_src-ae607dc8ef50d1ccdbc459d3793f9c6b40408dd7.zip chromium_src-ae607dc8ef50d1ccdbc459d3793f9c6b40408dd7.tar.gz chromium_src-ae607dc8ef50d1ccdbc459d3793f9c6b40408dd7.tar.bz2 | |
Fix SCons breakage, plus latest updates:
* Update src/DEPS to latest icu38 rev.
* Add new browser/views/frame/*.cc files.
* Add new browser/debugger/debugger_contents.cc file.
* Add new views/dialog_client_view.cc file.
* Build new browser/debugger/resources/debugger_resources.rc file.
* Add a new ChromeVersionRC() builder to the environment to provide a simpler, abstract interface for the four *version.rc files we build, with fixed definitions of $VERSION_BAT and $CHROME_SRC_DIR.
* Fix the definition of $HTML_INLINE.
R=deanm,bradnelson
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/mini_installer/SConscript | 15 | ||||
| -rw-r--r-- | chrome/installer/setup/SConscript | 23 |
2 files changed, 6 insertions, 32 deletions
diff --git a/chrome/installer/mini_installer/SConscript b/chrome/installer/mini_installer/SConscript index d75e02f..aac6f0a 100644 --- a/chrome/installer/mini_installer/SConscript +++ b/chrome/installer/mini_installer/SConscript @@ -134,18 +134,9 @@ packed = env.Command('$TARGET_ROOT/packed_files.txt', env.Depends(packed, '$TARGET_ROOT/setup.exe')
-env_version = env.Clone(
- VERSION_BAT = env.File('$CHROME_DIR/tools/build/win/version.bat'),
- CHROMEDIR = env.Dir('$CHROME_DIR'),
- PWD = env.Dir('.'),
-)
-
-env_version.Command('mini_installer_exe_version.rc',
- ['mini_installer_exe_version.rc.version',
- '$CHROME_DIR/VERSION',
- '$CHROME_DIR/BRANDING'
- ],
- "$VERSION_BAT $SOURCE $CHROMEDIR $PWD $TARGET")
+env.ChromeVersionRC('mini_installer_exe_version.rc',
+ 'mini_installer_exe_version.rc.version',
+ PWD=Dir('.'))
env_test.Prepend(
diff --git a/chrome/installer/setup/SConscript b/chrome/installer/setup/SConscript index c7a3f9d..65c6087 100644 --- a/chrome/installer/setup/SConscript +++ b/chrome/installer/setup/SConscript @@ -132,23 +132,6 @@ i = env.Install('$TARGET_ROOT', exe) env.Alias('chrome', i)
-
-env_version = env.Clone(
- VERSION_BAT = env.File('$CHROME_DIR/tools/build/win/version.bat'),
- CHROMEDIR = env.Dir('$CHROME_DIR'),
- PWD = env.Dir('.'),
-)
-
-import os
-env_version['ENV']['PROGRAMFILES'] = os.environ['PROGRAMFILES']
-env_version['ENV']['SystemDrive'] = os.environ['SystemDrive']
-env_version['ENV']['USERPROFILE'] = os.environ['USERPROFILE']
-env_version['ENV']['PATH'] = os.environ['PATH']
-
-setup_exe_version_rc = env_version.Command(
- 'setup_exe_version.rc',
- ['setup_exe_version.rc.version',
- '$CHROME_DIR/VERSION',
- '$CHROME_DIR/BRANDING'
- ],
- '$VERSION_BAT $SOURCE $CHROMEDIR $PWD $TARGET')
+env.ChromeVersionRC('setup_exe_version.rc',
+ 'setup_exe_version.rc.version',
+ PWD = env.Dir('.'))
|