forked from sanyaade-mobiledev/chromium.src
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Sweep the tree for SCons files still missing svn:eol-style LF.
Review URL: http://codereview.chromium.org/17297 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7781 0039d316-1c4b-4281-b951-d872f2087c98
- Loading branch information
sgk@google.com
committed
Jan 8, 2009
1 parent
fd26e20
commit f940db8
Showing
4 changed files
with
289 additions
and
289 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,43 @@ | ||
| # 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 the dump_cache{,.exe} executable. | ||
| """ | ||
| Import('env') | ||
| env = env.Clone() | ||
| env.ApplySConscript([ | ||
| '$BASE_DIR/using_base.scons', | ||
| '$ICU38_DIR/using_icu38.scons', | ||
| '$NET_DIR/using_net.scons', | ||
| ]) | ||
| if env.Bit('windows'): | ||
| env.Prepend( | ||
| CCFLAGS = [ | ||
| '/WX', | ||
| ], | ||
| ) | ||
| input_files = [ | ||
| 'tools/dump_cache/dump_cache.cc', | ||
| 'tools/dump_cache/dump_files.cc', | ||
| 'tools/dump_cache/upgrade.cc', | ||
| ] | ||
| if env.Bit('windows'): | ||
| env.ChromeTestProgram('dump_cache', input_files) | ||
| env.ChromeMSVSProject('$NET_DIR/build/dump_cache.vcproj', | ||
| dependencies = [ | ||
| '$BASE_DIR/build/base.vcproj', | ||
| '$ICU38_DIR/build/icu.vcproj', | ||
| '$NET_DIR/build/net.vcproj', | ||
| ], | ||
| guid='{4A14E455-2B7C-4C0F-BCC2-35A9666C186F}') | ||
| # 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 the dump_cache{,.exe} executable. | ||
| """ | ||
|
|
||
| Import('env') | ||
|
|
||
| env = env.Clone() | ||
|
|
||
| env.ApplySConscript([ | ||
| '$BASE_DIR/using_base.scons', | ||
| '$ICU38_DIR/using_icu38.scons', | ||
| '$NET_DIR/using_net.scons', | ||
| ]) | ||
|
|
||
| if env.Bit('windows'): | ||
| env.Prepend( | ||
| CCFLAGS = [ | ||
| '/WX', | ||
| ], | ||
| ) | ||
|
|
||
| input_files = [ | ||
| 'tools/dump_cache/dump_cache.cc', | ||
| 'tools/dump_cache/dump_files.cc', | ||
| 'tools/dump_cache/upgrade.cc', | ||
| ] | ||
|
|
||
|
|
||
| if env.Bit('windows'): | ||
|
|
||
| env.ChromeTestProgram('dump_cache', input_files) | ||
|
|
||
| env.ChromeMSVSProject('$NET_DIR/build/dump_cache.vcproj', | ||
| dependencies = [ | ||
| '$BASE_DIR/build/base.vcproj', | ||
| '$ICU38_DIR/build/icu.vcproj', | ||
| '$NET_DIR/build/net.vcproj', | ||
| ], | ||
| guid='{4A14E455-2B7C-4C0F-BCC2-35A9666C186F}') |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,126 +1,126 @@ | ||
| # 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') | ||
|
|
||
| env.Prepend(CPPPATH = cpppath) | ||
|
|
||
| input_files = [ | ||
| '$OPEN_VCDIFF_DIR/src/addrcache.cc', | ||
| '$OPEN_VCDIFF_DIR/src/adler32.c', | ||
| '$OPEN_VCDIFF_DIR/src/blockhash.cc', | ||
| '$OPEN_VCDIFF_DIR/src/codetable.cc', | ||
| '$OPEN_VCDIFF_DIR/src/decodetable.cc', | ||
| '$OPEN_VCDIFF_DIR/src/encodetable.cc', | ||
| '$OPEN_VCDIFF_DIR/src/headerparser.cc', | ||
| '$OPEN_VCDIFF_DIR/src/instruction_map.cc', | ||
| '$OPEN_VCDIFF_DIR/src/logging.cc', | ||
| '$OPEN_VCDIFF_DIR/src/varint_bigendian.cc', | ||
| '$OPEN_VCDIFF_DIR/src/vcdecoder.cc', | ||
| '$OPEN_VCDIFF_DIR/src/vcdiffengine.cc', | ||
| ] | ||
|
|
||
| env.ChromeLibrary('sdch', input_files) | ||
|
|
||
| env.ChromeMSVSProject('$SDCH_DIR/sdch.vcproj', | ||
| guid='{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}') | ||
|
|
||
| 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. | ||
| env.Command('$OPEN_VCDIFF_DIR/src/config.h', | ||
| '$OPEN_VCDIFF_DIR/src/config.h.in', | ||
| Action(AutoConfig, varlist=['DEFINES']), | ||
| DEFINES=defines) | ||
| # 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') | ||
|
|
||
| env.Prepend(CPPPATH = cpppath) | ||
|
|
||
| input_files = [ | ||
| '$OPEN_VCDIFF_DIR/src/addrcache.cc', | ||
| '$OPEN_VCDIFF_DIR/src/adler32.c', | ||
| '$OPEN_VCDIFF_DIR/src/blockhash.cc', | ||
| '$OPEN_VCDIFF_DIR/src/codetable.cc', | ||
| '$OPEN_VCDIFF_DIR/src/decodetable.cc', | ||
| '$OPEN_VCDIFF_DIR/src/encodetable.cc', | ||
| '$OPEN_VCDIFF_DIR/src/headerparser.cc', | ||
| '$OPEN_VCDIFF_DIR/src/instruction_map.cc', | ||
| '$OPEN_VCDIFF_DIR/src/logging.cc', | ||
| '$OPEN_VCDIFF_DIR/src/varint_bigendian.cc', | ||
| '$OPEN_VCDIFF_DIR/src/vcdecoder.cc', | ||
| '$OPEN_VCDIFF_DIR/src/vcdiffengine.cc', | ||
| ] | ||
|
|
||
| env.ChromeLibrary('sdch', input_files) | ||
|
|
||
| env.ChromeMSVSProject('$SDCH_DIR/sdch.vcproj', | ||
| guid='{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}') | ||
|
|
||
| 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. | ||
| env.Command('$OPEN_VCDIFF_DIR/src/config.h', | ||
| '$OPEN_VCDIFF_DIR/src/config.h.in', | ||
| Action(AutoConfig, varlist=['DEFINES']), | ||
| DEFINES=defines) |
Oops, something went wrong.