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 /third_party | |
| 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 'third_party')
| -rw-r--r-- | third_party/bsdiff/SConscript | 8 | ||||
| -rw-r--r-- | third_party/bspatch/SConscript | 9 | ||||
| -rw-r--r-- | third_party/bzip2/SConscript | 7 | ||||
| -rw-r--r-- | third_party/libjpeg/SConscript | 3 | ||||
| -rw-r--r-- | third_party/libpng/SConscript | 3 | ||||
| -rw-r--r-- | third_party/libxml/SConscript | 3 | ||||
| -rw-r--r-- | third_party/libxslt/SConscript | 3 | ||||
| -rw-r--r-- | third_party/lzma_sdk/SConscript | 31 | ||||
| -rw-r--r-- | third_party/zlib/SConscript | 3 |
9 files changed, 20 insertions, 50 deletions
diff --git a/third_party/bsdiff/SConscript b/third_party/bsdiff/SConscript index faf1247..adcf647 100644 --- a/third_party/bsdiff/SConscript +++ b/third_party/bsdiff/SConscript @@ -40,15 +40,7 @@ env.Prepend( env.Append(
CCFLAGS = [
'/TP',
-
'/wd4800',
- '/wd4503',
- '/wd4819',
- ],
-
- CPPDEFINES = [
- 'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',
- 'WIN32_LEAN_AND_MEAN',
],
)
diff --git a/third_party/bspatch/SConscript b/third_party/bspatch/SConscript index 3889ea6..0df2882 100644 --- a/third_party/bspatch/SConscript +++ b/third_party/bspatch/SConscript @@ -44,15 +44,12 @@ env.Append( ],
CCFLAGS = [
'/TP',
-
'/wd4800',
- '/wd4503',
- '/wd4819',
],
)
-input_files = Split('''
- mbspatch.cc
-''')
+input_files = [
+ 'mbspatch.cc',
+]
env.StaticLibrary('bspatch', input_files)
diff --git a/third_party/bzip2/SConscript b/third_party/bzip2/SConscript index 6f2157e..1457400 100644 --- a/third_party/bzip2/SConscript +++ b/third_party/bzip2/SConscript @@ -33,13 +33,12 @@ env = env.Clone() env.Append(
CCFLAGS = [
- '/DBZ_NO_STDIO',
'/TC',
-
'/wd4996',
'/wd4800',
- '/wd4503',
- '/wd4819',
+ ],
+ CPPDEFINES = [
+ 'BZ_NO_STDIO',
],
)
diff --git a/third_party/libjpeg/SConscript b/third_party/libjpeg/SConscript index 2fcd353..3c5399c 100644 --- a/third_party/libjpeg/SConscript +++ b/third_party/libjpeg/SConscript @@ -40,10 +40,7 @@ env.Prepend( env.Append(
CCFLAGS = [
'/TC',
-
'/wd4800',
- '/wd4503',
- '/wd4819',
],
)
diff --git a/third_party/libpng/SConscript b/third_party/libpng/SConscript index cd1f168..ad6bdf9 100644 --- a/third_party/libpng/SConscript +++ b/third_party/libpng/SConscript @@ -41,10 +41,7 @@ env.Prepend( env.Append(
CCFLAGS = [
'/TP',
-
'/wd4800',
- '/wd4503',
- '/wd4819',
],
CPPDEFINES = [
'PNG_USER_CONFIG',
diff --git a/third_party/libxml/SConscript b/third_party/libxml/SConscript index 0f9cdd1..a4d024a 100644 --- a/third_party/libxml/SConscript +++ b/third_party/libxml/SConscript @@ -49,10 +49,7 @@ env.Append( ],
CCFLAGS = [
'/TC',
-
'/wd4800',
- '/wd4503',
- '/wd4819',
],
)
diff --git a/third_party/libxslt/SConscript b/third_party/libxslt/SConscript index 2c070e3..8f92607 100644 --- a/third_party/libxslt/SConscript +++ b/third_party/libxslt/SConscript @@ -51,10 +51,7 @@ env.Append( ],
CCFLAGS = [
'/TC',
-
'/wd4800',
- '/wd4503',
- '/wd4819',
],
)
diff --git a/third_party/lzma_sdk/SConscript b/third_party/lzma_sdk/SConscript index 8809e47..74fb2de 100644 --- a/third_party/lzma_sdk/SConscript +++ b/third_party/lzma_sdk/SConscript @@ -46,26 +46,23 @@ env.Append( ],
CCFLAGS = [
'/TC',
-
'/wd4800',
- '/wd4503',
- '/wd4819',
],
)
-input_files = Split('''
- Compress/Lzma/LzmaDecode.c
- Archive/7z/7zMethodID.c
- Archive/7z/7zItem.c
- Archive/7z/7zIn.c
- Archive/7z/7zHeader.c
- Archive/7z/7zExtract.c
- Archive/7z/7zDecode.c
- Archive/7z/7zBuffer.c
- Archive/7z/7zAlloc.c
- Compress/Branch/BranchX86_2.c
- Compress/Branch/BranchX86.c
- 7zCrc.c
-''')
+input_files = [
+ 'Compress/Lzma/LzmaDecode.c',
+ 'Archive/7z/7zMethodID.c',
+ 'Archive/7z/7zItem.c',
+ 'Archive/7z/7zIn.c',
+ 'Archive/7z/7zHeader.c',
+ 'Archive/7z/7zExtract.c',
+ 'Archive/7z/7zDecode.c',
+ 'Archive/7z/7zBuffer.c',
+ 'Archive/7z/7zAlloc.c',
+ 'Compress/Branch/BranchX86_2.c',
+ 'Compress/Branch/BranchX86.c',
+ '7zCrc.c',
+]
env.StaticLibrary('lzma_sdk', input_files)
diff --git a/third_party/zlib/SConscript b/third_party/zlib/SConscript index 62ab735..5a7de33 100644 --- a/third_party/zlib/SConscript +++ b/third_party/zlib/SConscript @@ -34,10 +34,7 @@ env = env.Clone() env.Append(
CCFLAGS = [
'/TC',
-
'/wd4800',
- '/wd4503',
- '/wd4819',
],
)
|