diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-31 07:25:19 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-31 07:25:19 +0000 |
| commit | 55329d53c0322b66da982bccf0dc2a28c7c7fc8c (patch) | |
| tree | 19550e26a26066035e41c036b21c415918b772d2 /chrome/installer/setup | |
| parent | 1920e823284826c00ba11adb1ff3ccb7fba2f0f5 (diff) | |
| download | chromium_src-55329d53c0322b66da982bccf0dc2a28c7c7fc8c.zip chromium_src-55329d53c0322b66da982bccf0dc2a28c7c7fc8c.tar.gz chromium_src-55329d53c0322b66da982bccf0dc2a28c7c7fc8c.tar.bz2 | |
Initial cleanups en route to coalescing the get-it-built cut-and-paste from various SConscripts into readable and maintainable shape. To wit:
* Put the near-universal settings of /DCERT_CHAIN_PARA_HAS_EXTRA_FIELDS, /DWIN32_LEAN_AND_MEAN, /wd4503 and /wd4819 in the base construction environment.
* Sort various unsorted source file lists.
* Fix indentation and quoting for consistency in a couple SConscript files that escaped previous dragnets.
* Eliminate two left-over uses of Split() for input file lists.
* Give the devenv invocation to build v8_shell.exe the full path to the relevant .vcproj file.
* Add /nologo to the base LINKFLAGS setting.
* Remove various CPPPATH and other settings that have been hanging around commented out from the Visual Studio build (in case we needed them, which we evidently don't).
* Get rid of unnecessary env.File() and env.Dir() calls in various settings (esp. CPPPATH) and source file lists.
* Add copyright notice to an overlooked SConscript file.
* Clean up version.bat invocation.
TBR: bradnelson
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup')
| -rw-r--r-- | chrome/installer/setup/SConscript | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/installer/setup/SConscript b/chrome/installer/setup/SConscript index b26790f..c7a3f9d 100644 --- a/chrome/installer/setup/SConscript +++ b/chrome/installer/setup/SConscript @@ -134,9 +134,9 @@ env.Alias('chrome', i) env_version = env.Clone(
- VERSION_BAT = File('#/../chrome/tools/build/win/version.bat'),
- CHROMEDIR = Dir('#/../chrome'),
- PWD = Dir('.'),
+ VERSION_BAT = env.File('$CHROME_DIR/tools/build/win/version.bat'),
+ CHROMEDIR = env.Dir('$CHROME_DIR'),
+ PWD = env.Dir('.'),
)
import os
@@ -148,6 +148,7 @@ env_version['ENV']['PATH'] = os.environ['PATH'] setup_exe_version_rc = env_version.Command(
'setup_exe_version.rc',
['setup_exe_version.rc.version',
- '$CHROMEDIR/VERSION',
- '$CHROMEDIR/BRANDING'],
+ '$CHROME_DIR/VERSION',
+ '$CHROME_DIR/BRANDING'
+ ],
'$VERSION_BAT $SOURCE $CHROMEDIR $PWD $TARGET')
|