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 /build | |
| 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 'build')
| -rw-r--r-- | build/SConscript.googleurl | 7 | ||||
| -rw-r--r-- | build/SConscript.main | 10 | ||||
| -rw-r--r-- | build/SConscript.v8 | 2 |
3 files changed, 10 insertions, 9 deletions
diff --git a/build/SConscript.googleurl b/build/SConscript.googleurl index ab9ee4c..801370d 100644 --- a/build/SConscript.googleurl +++ b/build/SConscript.googleurl @@ -42,17 +42,10 @@ env.Prepend( env.Append(
CPPDEFINES = [
'U_STATIC_IMPLEMENTATION',
- 'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',
- 'WIN32_LEAN_AND_MEAN',
],
CCFLAGS = [
'/TP',
-
- '/Wp64',
-
- '/wd4503',
- '/wd4819',
],
)
diff --git a/build/SConscript.main b/build/SConscript.main index 3290b12..741afdc 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -126,6 +126,8 @@ env = Environment( ], CCFLAGS = [ + '/nologo', + '/Od', # no optimization '/RTC1', @@ -137,8 +139,10 @@ env = Environment( '/Z7', - '/nologo', '/errorReport:prompt', + + '/wd4503', + '/wd4819', ], CPPDEFINES = [ @@ -158,6 +162,9 @@ env = Environment( 'NOMINMAX', '_UNICODE', 'UNICODE', + + 'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS', + 'WIN32_LEAN_AND_MEAN', ], CPPPATH = [ @@ -173,6 +180,7 @@ env = Environment( ], LINKFLAGS = [ + '/nologo', '/DEBUG', ], ) diff --git a/build/SConscript.v8 b/build/SConscript.v8 index 53afdb9..d995477 100644 --- a/build/SConscript.v8 +++ b/build/SConscript.v8 @@ -65,7 +65,7 @@ env.Alias('webkit', i) v8_shell = env.Command(v8_exe,
[],
- 'cd ..\\v8 && devenv /nologo v8.sln /build Debug v8_shell')
+ 'cd ..\\v8 && devenv /nologo v8.sln /build Debug vcproj\\v8_shell.vcproj')
env.AlwaysBuild(v8_shell)
i = env.Install('$TARGET_ROOT', v8_exe)
|