summaryrefslogtreecommitdiffstats
path: root/third_party/bsdiff
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-14 23:00:46 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-14 23:00:46 +0000
commit94f686369c158fe46a327849ccae9f31c423adef (patch)
tree11a749e1cb4078790d6429e25a346a018cd03e1d /third_party/bsdiff
parentb496c9e6770e4951eec84b17d5c84454815bf796 (diff)
downloadchromium_src-94f686369c158fe46a327849ccae9f31c423adef.zip
chromium_src-94f686369c158fe46a327849ccae9f31c423adef.tar.gz
chromium_src-94f686369c158fe46a327849ccae9f31c423adef.tar.bz2
More *.scons renaming:
* Rename SConscript to *.scons in the following directories: third_party\{bspatch,bsdiff,lzma_dsk} chrome\installer\{setup,mini_installer,util} * Split mini_installer and installer_unittests into separate *.scons files. * Add using_bspatch.scons and using_lzma_sdk.scons "properties" files, modifying other *.scons files to use them as appropriate. Review URL: http://codereview.chromium.org/10952 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5515 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/bsdiff')
-rw-r--r--third_party/bsdiff/SConscript53
-rw-r--r--third_party/bsdiff/bsdiff.scons25
2 files changed, 25 insertions, 53 deletions
diff --git a/third_party/bsdiff/SConscript b/third_party/bsdiff/SConscript
deleted file mode 100644
index e1408c8..0000000
--- a/third_party/bsdiff/SConscript
+++ /dev/null
@@ -1,53 +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()
-
-env.Prepend(
- CPPPATH = [
- '../bspatch',
- ]
-)
-
-if env['PLATFORM'] == 'win32':
- env.Append(
- CCFLAGS = [
- '/TP',
- '/wd4800',
- ],
- )
-
-input_files = [
- "mbsdiff.cc",
-]
-
-env.ChromeStaticLibrary('bsdiff', input_files)
diff --git a/third_party/bsdiff/bsdiff.scons b/third_party/bsdiff/bsdiff.scons
new file mode 100644
index 0000000..9aa56fb
--- /dev/null
+++ b/third_party/bsdiff/bsdiff.scons
@@ -0,0 +1,25 @@
+# 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.
+
+Import('env')
+
+env = env.Clone()
+
+env.ApplySConscript([
+ '$BSPATCH_DIR/using_bspatch.scons',
+])
+
+if env['PLATFORM'] == 'win32':
+ env.Append(
+ CCFLAGS = [
+ '/TP',
+ '/wd4800',
+ ],
+ )
+
+input_files = [
+ "mbsdiff.cc",
+]
+
+env.ChromeStaticLibrary('bsdiff', input_files)