diff options
author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-21 20:24:56 +0000 |
---|---|---|
committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-21 20:24:56 +0000 |
commit | 4c75444536c32d6f57801ab73129e90b93db0605 (patch) | |
tree | cf468f03b60942cbccd8a166713cf39a610f0131 /third_party/zlib | |
parent | ad11a576675dba34fe8f84f2abe6d1fed793b874 (diff) | |
download | chromium_src-4c75444536c32d6f57801ab73129e90b93db0605.zip chromium_src-4c75444536c32d6f57801ab73129e90b93db0605.tar.gz chromium_src-4c75444536c32d6f57801ab73129e90b93db0605.tar.bz2 |
SCons renaming updates for base, net and googleurl:
* Rename SConscript files to {module}.scons or {moduel}_lib.scons,
depending on the primary target involved.
* Separate targets into individual *.scons files, with one
construction environment (named "env") per *.scons file.
* Add using_{module}.scons files (like .vsprops) that will be used
by other modules to add CPPDEFINES, CPPPATH, LIBS and LIBPATH values.
* Update other modules' *.scons files to use the new using_{module}.scons
files (using a temporary one-liner idiom until we have the
ApplySConscript() method from the Hammer modules).
* Use the idiom of removing to-be-ported files from the master list,
so they can be simply deleted from the to-be-ported list as they
get ported in the future, instead of having to shuffle entries
between lists.
* Use $OBJ_ROOT instead of hard-coded '#/$BUILD_TYPE/' for the $*_DIR
variables.
* Add a addRepository() call mapping build/ to $TARGET_ROOT/googleurl,
so its $OBJ_ROOT value can look like the others'.
* Formatting changes, primarily modifying indentation to conform to
style guidelines.
* Fix copyright headers in some third_party/* modules
previously overlooked.
* Add rudimentary __doc__ strings, setting up for a future
ability to generate meaningful documentation.
Review URL: http://codereview.chromium.org/7807
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3675 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/zlib')
-rw-r--r-- | third_party/zlib/SConscript | 58 | ||||
-rw-r--r-- | third_party/zlib/using_zlib.scons | 18 | ||||
-rw-r--r-- | third_party/zlib/zlib.scons | 36 |
3 files changed, 54 insertions, 58 deletions
diff --git a/third_party/zlib/SConscript b/third_party/zlib/SConscript deleted file mode 100644 index 490ce01..0000000 --- a/third_party/zlib/SConscript +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 2008, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# TODO(keunwoo): Use better cross-platform abstraction; see chrome/SConstruct -Import('env') - -env = env.Clone() - -if env['PLATFORM'] == 'win32': - env.Append( - CCFLAGS = [ - '/TC', - '/wd4800', - ], - ) - -input_files = [ - 'adler32.c', - 'compress.c', - 'crc32.c', - 'deflate.c', - 'gzio.c', - 'infback.c', - 'inffast.c', - 'inflate.c', - 'inftrees.c', - 'trees.c', - 'uncompr.c', - 'zutil.c', -] - -env.ChromeStaticLibrary('zlib', input_files) diff --git a/third_party/zlib/using_zlib.scons b/third_party/zlib/using_zlib.scons new file mode 100644 index 0000000..60bceb7 --- /dev/null +++ b/third_party/zlib/using_zlib.scons @@ -0,0 +1,18 @@ +# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +__doc__ = """ +Settings for other components using the zlib library. +""" + +Import("env") + +env.Append( + CPPPATH = [ + '$ZLIB_DIR', + ], + LIBS = [ + 'zlib', + ], +) diff --git a/third_party/zlib/zlib.scons b/third_party/zlib/zlib.scons new file mode 100644 index 0000000..a7dcb89 --- /dev/null +++ b/third_party/zlib/zlib.scons @@ -0,0 +1,36 @@ +# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +__doc__ = """ +Configuration for building zlib.lib / libzlib.a. +""" + +Import('env') + +env = env.Clone() + +if env['PLATFORM'] == 'win32': + env.Append( + CCFLAGS = [ + '/TC', + '/wd4800', + ], + ) + +input_files = [ + 'adler32.c', + 'compress.c', + 'crc32.c', + 'deflate.c', + 'gzio.c', + 'infback.c', + 'inffast.c', + 'inflate.c', + 'inftrees.c', + 'trees.c', + 'uncompr.c', + 'zutil.c', +] + +env.ChromeStaticLibrary('zlib', input_files) |