summaryrefslogtreecommitdiffstats
path: root/sdch
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-01 22:05:12 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-01 22:05:12 +0000
commit0fad1f1a74408b939d1b09dcc2f9391544e7e692 (patch)
treec62164260c26f143c9ae43c32694142a725bc7eb /sdch
parenta9b826af8ef183810c176b9ede4a2934f4678d50 (diff)
downloadchromium_src-0fad1f1a74408b939d1b09dcc2f9391544e7e692.zip
chromium_src-0fad1f1a74408b939d1b09dcc2f9391544e7e692.tar.gz
chromium_src-0fad1f1a74408b939d1b09dcc2f9391544e7e692.tar.bz2
Remove the checked-in scons configuration files.
Review URL: http://codereview.chromium.org/53121 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sdch')
-rw-r--r--sdch/SConscript204
-rw-r--r--sdch/using_sdch.scons18
2 files changed, 0 insertions, 222 deletions
diff --git a/sdch/SConscript b/sdch/SConscript
deleted file mode 100644
index 38455e0..0000000
--- a/sdch/SConscript
+++ /dev/null
@@ -1,204 +0,0 @@
-# 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 re
-
-Import('env')
-
-env = env.Clone(OPEN_VCDIFF_DIR='open-vcdiff')
-
-cpppath = [
- '$OPEN_VCDIFF_DIR/src',
-]
-
-if env.Bit('windows'):
- cpppath.append('$OPEN_VCDIFF_DIR/vsprojects')
-
-if env.Bit('linux'):
- cpppath.append('linux')
-
-env.Prepend(CPPPATH = cpppath)
-
-input_files = ChromeFileList([
- # TODO(sgk): violate standard indentation so we don't have to
- # reindent too much when we remove the explicit MSVSFilter() calls
- # in favor of generating the hierarchy to reflect the file system.
- MSVSFilter('Header Files', [
- 'open-vcdiff/src/blockhash.h',
- 'open-vcdiff/src/checksum.h',
- 'open-vcdiff/src/codetable.h',
- 'open-vcdiff/src/compile_assert.h',
- 'open-vcdiff/vsprojects/config.h',
- 'open-vcdiff/src/decodetable.h',
- 'open-vcdiff/src/encodetable.h',
- 'open-vcdiff/src/headerparser.h',
- 'open-vcdiff/src/instruction_map.h',
- 'open-vcdiff/src/logging.h',
- 'open-vcdiff/src/google/output_string.h',
- 'open-vcdiff/src/rolling_hash.h',
- 'open-vcdiff/vsprojects/stdint.h',
- 'open-vcdiff/src/testing.h',
- 'open-vcdiff/src/varint_bigendian.h',
- 'open-vcdiff/src/google/vcdecoder.h',
- 'open-vcdiff/src/vcdiff_defs.h',
- 'open-vcdiff/src/vcdiffengine.h',
- 'open-vcdiff/src/zconf.h',
- 'open-vcdiff/src/zlib.h',
- ]),
- MSVSFilter('Source Files', [
- 'open-vcdiff/src/addrcache.cc',
- 'open-vcdiff/src/adler32.c',
- 'open-vcdiff/src/blockhash.cc',
- 'open-vcdiff/src/codetable.cc',
- 'open-vcdiff/src/decodetable.cc',
- 'open-vcdiff/src/encodetable.cc',
- 'open-vcdiff/src/headerparser.cc',
- 'open-vcdiff/src/instruction_map.cc',
- 'open-vcdiff/src/logging.cc',
- 'open-vcdiff/src/varint_bigendian.cc',
- 'open-vcdiff/src/vcdecoder.cc',
- 'open-vcdiff/src/vcdiffengine.cc',
- ]),
-])
-
-env.ChromeLibrary('sdch', input_files)
-
-if env.Bit('posix'):
-
- # Generate a target config.h file from a source config.h.in file.
- #
- # The list of defines has been taken empirically from Autoconf
- # (./configure) runs on Mac OS X and Ubuntu Hardy.
-
- defines = [
- 'HAVE_DLFCN_H',
- 'HAVE_FNMATCH_H',
- 'HAVE_GETOPT_H',
- 'HAVE_GETTIMEOFDAY',
- 'HAVE_INTTYPES_H',
- 'HAVE_MEMORY_H',
- 'HAVE_MPROTECT',
- 'HAVE_PTHREAD',
- 'HAVE_STDINT_H',
- 'HAVE_STDLIB_H',
- 'HAVE_STRINGS_H',
- 'HAVE_STRING_H',
- 'HAVE_STRTOLL',
- 'HAVE_STRTOQ',
- 'HAVE_SYS_MMAN_H',
- 'HAVE_SYS_STAT_H',
- 'HAVE_SYS_TIME_H',
- 'HAVE_SYS_TYPES_H',
- 'HAVE_UINT16_T',
- 'HAVE_UNISTD_H',
- 'HAVE_U_INT16_T',
- 'HAVE___ATTRIBUTE__',
- ('PACKAGE', '"open-vcdiff"'),
- ('PACKAGE_BUGREPORT', '"opensource@google.com"'),
- ('PACKAGE_NAME', '"open-vcdiff"'),
- ('PACKAGE_STRING', '"open-vcdiff 0.1"'),
- ('PACKAGE_TARNAME', '"open-vcdiff"'),
- ('PACKAGE_VERSION', '"0.1"'),
- ('VERSION', '"0.1"'),
- 'STDC_HEADERS',
- ]
-
- if env.Bit('linux'):
- defines.extend([
- 'HAVE_MALLOC_H',
- 'HAVE_MEMALIGN',
- 'HAVE_POSIX_MEMALIGN',
- ])
-
- if env.Bit('mac'):
- defines.extend([
- 'HAVE_WORKING_KQUEUE',
- ])
-
- def AutoConfig(target, source, env):
- """
- Action to generate a config.h file from an Autotools config.h.in file,
- given the list of definitions in the DEFINES construction variable.
-
- Each entry in DEFINES is either a string, in which case it
- will be enabled with a value of 1, or a tuple, in which case
- the first element is the #define name and the second its value.
-
- Any leftover #undef lines get commented out.
- """
- contents = open(str(source[0]), 'r').read()
-
- for d in env['DEFINES']:
- if isinstance(d, tuple):
- define, value = d
- else:
- define = d
- value = 1
- undef = '^#undef %s$' % re.escape(define)
- definition = '#define %s %s' % (define, value)
- contents = re.sub(undef, definition, contents)
-
- undef_re = re.compile(r'^(#undef .*)$', re.M)
- contents = undef_re.sub(r'/* \1 */', contents)
-
- header = '/* src/config.h. Generated by SCons. */\n'
- open(str(target[0]), 'w').write(header + contents)
-
- # varlist['DEFINES'] below makes the target config.h file depend
- # on the list of definitions in the passed-in $DEFINES variable.
- #
- # Comment this out so we use the checked-in config.h in the
- # linux subdirectory, but leave it here in case we need
- # to ressurect this.
- #env.Command('$OPEN_VCDIFF_DIR/src/config.h',
- # '$OPEN_VCDIFF_DIR/src/config.h.in',
- # Action(AutoConfig, varlist=['DEFINES']),
- # DEFINES=defines)
-
-
-p = env.ChromeMSVSProject('sdch.vcproj',
- dest='$CHROME_SRC_DIR/sdch/sdch.vcproj',
- guid='{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}',
- keyword='Win32Proj',
- # TODO(sgk): when we can intuit the hierarchy
- # from the built targets.
- #buildtargets=TODO,
- files=input_files,
- relative_path_prefix='./',
- tools=[
- 'VCPreBuildEventTool',
- 'VCCustomBuildTool',
- 'VCXMLDataGeneratorTool',
- 'VCWebServiceProxyGeneratorTool',
- 'VCMIDLTool',
- MSVSTool('VCCLCompilerTool',
- AdditionalIncludeDirectories=[
- './open-vcdiff/vsprojects',
- '',
- ],
- DefaultCharIsUnsigned="true"),
- 'VCManagedResourceCompilerTool',
- 'VCResourceCompilerTool',
- 'VCPreLinkEventTool',
- 'VCLibrarianTool',
- 'VCALinkTool',
- 'VCXDCMakeTool',
- 'VCBscMakeTool',
- 'VCFxCopTool',
- 'VCPostBuildEventTool',
- ],
- ConfigurationType='4')
-
-
-p.AddConfig('Debug|Win32',
- InheritedPropertySheets=[
- '$(SolutionDir)../build/debug.vsprops',
- '$(SolutionDir)../sdch/using_sdch.vsprops',
- ])
-
-p.AddConfig('Release|Win32',
- InheritedPropertySheets=[
- '$(SolutionDir)../build/release.vsprops',
- '$(SolutionDir)../sdch/using_sdch.vsprops',
- ])
diff --git a/sdch/using_sdch.scons b/sdch/using_sdch.scons
deleted file mode 100644
index f99c503..0000000
--- a/sdch/using_sdch.scons
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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 sdch library.
-"""
-
-Import("env")
-
-env.Append(
- CPPPATH = [
- '$SDCH_DIR/open-vcdiff/src',
- ],
- LIBS = [
- 'sdch',
- ],
-)