diff options
| -rw-r--r-- | net/dump_cache.scons | 86 | ||||
| -rw-r--r-- | sdch/SConscript | 252 | ||||
| -rw-r--r-- | webkit/SConscript.javascriptcore_pcre | 110 | ||||
| -rw-r--r-- | webkit/SConscript.port | 130 |
4 files changed, 289 insertions, 289 deletions
diff --git a/net/dump_cache.scons b/net/dump_cache.scons index 31d34bc..0dfa39c 100644 --- a/net/dump_cache.scons +++ b/net/dump_cache.scons @@ -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}') diff --git a/sdch/SConscript b/sdch/SConscript index 6c70f45..64ac0e2 100644 --- a/sdch/SConscript +++ b/sdch/SConscript @@ -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) diff --git a/webkit/SConscript.javascriptcore_pcre b/webkit/SConscript.javascriptcore_pcre index d30e771..b0a4aad 100644 --- a/webkit/SConscript.javascriptcore_pcre +++ b/webkit/SConscript.javascriptcore_pcre @@ -1,55 +1,55 @@ -# 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(
- PCRE_DIR = '$WEBKIT_DIR/port/JavaScriptCore/pcre',
-)
-
-env.Prepend(
- CPPPATH = [
- '$WEBKIT_DIR/port/JavaScriptCore',
- '$WEBKIT_DIR/port/JavaScriptCore/pcre',
- '$WEBKIT_DIR/build/JSConfig/WebCore/v8',
- ])
-
-if env.Bit('windows'):
- env.Prepend(
- CCFLAGS = [
- '/TP',
- '/wd4127',
- '/wd4355',
- '/wd4510',
- '/wd4512',
- '/wd4610',
- '/wd4706',
- '/wd4800',
- ],
- )
-
-# Map Hammer/webkit/port/JavaScriptCore/pcre so it's backed by
-# third_party/WebKit/JavaScriptCore/pcre.
-#
-# TODO(sgk): This can be refactored to work more naturally if we just
-# mirror third_party directory structure under webkit/port, instead of
-# mapping Javascript => Javascript (here) and Webkit/WebCore => port
-# (over in ../build/SConscript.main).
-
-obj_dir = env.Dir('$PCRE_DIR')
-src_dir = env.Dir('$CHROME_SRC_DIR/third_party/WebKit/JavaScriptCore/pcre')
-obj_dir.addRepository(src_dir)
-
-input_files = [
- '$PCRE_DIR/pcre_compile.cpp',
- '$PCRE_DIR/pcre_xclass.cpp',
- '$PCRE_DIR/pcre_ucp_searchfuncs.cpp',
- '$PCRE_DIR/pcre_tables.cpp',
- '$PCRE_DIR/pcre_exec.cpp',
-]
-
-env.ChromeLibrary('JavaScriptCore_pcre', input_files)
-
-env.ChromeMSVSProject('$WEBKIT_DIR/build/JavaScriptCore/JavaScriptCore_pcre.vcproj',
- guid='{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}')
+# 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( + PCRE_DIR = '$WEBKIT_DIR/port/JavaScriptCore/pcre', +) + +env.Prepend( + CPPPATH = [ + '$WEBKIT_DIR/port/JavaScriptCore', + '$WEBKIT_DIR/port/JavaScriptCore/pcre', + '$WEBKIT_DIR/build/JSConfig/WebCore/v8', + ]) + +if env.Bit('windows'): + env.Prepend( + CCFLAGS = [ + '/TP', + '/wd4127', + '/wd4355', + '/wd4510', + '/wd4512', + '/wd4610', + '/wd4706', + '/wd4800', + ], + ) + +# Map Hammer/webkit/port/JavaScriptCore/pcre so it's backed by +# third_party/WebKit/JavaScriptCore/pcre. +# +# TODO(sgk): This can be refactored to work more naturally if we just +# mirror third_party directory structure under webkit/port, instead of +# mapping Javascript => Javascript (here) and Webkit/WebCore => port +# (over in ../build/SConscript.main). + +obj_dir = env.Dir('$PCRE_DIR') +src_dir = env.Dir('$CHROME_SRC_DIR/third_party/WebKit/JavaScriptCore/pcre') +obj_dir.addRepository(src_dir) + +input_files = [ + '$PCRE_DIR/pcre_compile.cpp', + '$PCRE_DIR/pcre_xclass.cpp', + '$PCRE_DIR/pcre_ucp_searchfuncs.cpp', + '$PCRE_DIR/pcre_tables.cpp', + '$PCRE_DIR/pcre_exec.cpp', +] + +env.ChromeLibrary('JavaScriptCore_pcre', input_files) + +env.ChromeMSVSProject('$WEBKIT_DIR/build/JavaScriptCore/JavaScriptCore_pcre.vcproj', + guid='{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}') diff --git a/webkit/SConscript.port b/webkit/SConscript.port index d23902e..2aa026b 100644 --- a/webkit/SConscript.port +++ b/webkit/SConscript.port @@ -1,65 +1,65 @@ -# 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()
-
-if env.Bit('windows'):
- env.Prepend(
- CCFLAGS = [
- '/TP',
-
- '/wd4244',
- '/wd4291',
- '/wd4345',
- '/wd4521',
- '/wd4800',
- ],)
-elif env.Bit('linux'):
- env.Append(
- # For the image readers and decoders:
- CXXFLAGS = ["-Wno-sign-compare"],
- LIBS = ['png'],
- )
-
-input_files = [
- '$PORT_DIR/platform/image-decoders/bmp/BMPImageDecoder.cpp',
- '$PORT_DIR/platform/image-decoders/bmp/BMPImageReader.cpp',
- '$PORT_DIR/platform/image-decoders/gif/GIFImageDecoder.cpp',
- '$PORT_DIR/platform/image-decoders/gif/GIFImageReader.cpp',
- '$PORT_DIR/platform/image-decoders/ico/ICOImageDecoder.cpp',
- '$PORT_DIR/platform/image-decoders/jpeg/JPEGImageDecoder.cpp',
- '$PORT_DIR/platform/image-decoders/png/PNGImageDecoder.cpp',
- '$PORT_DIR/platform/image-decoders/xbm/XBMImageDecoder.cpp',
-]
-
-if env.Bit('mac'):
- # Mac specific implementations.
- input_files.extend([
- '$PORT_DIR/platform/graphics/mac/FontCacheMacPending.cpp',
- '$PORT_DIR/rendering/RenderThemeMac.mm',
- ])
-
-if env.get('KJS'):
- # These actually no longer exist, but since JSC build is super-broken, we'll
- # leave them here as stark reminders of our past.
- input_files.extend([
- '$PORT_DIR/bridge/KJSBridge.cpp',
- '$PORT_DIR/bridge/ScriptControllerKJS.cpp',
- ])
-else:
- input_files.extend([
- '$PORT_DIR/bindings/v8/ScriptController.cpp',
- ])
-
-env.ChromeLibrary("port", input_files)
-
-env.ChromeMSVSProject('$WEBKIT_DIR/build/port/port.vcproj',
- name = 'Port',
- dependencies = [
- '$WEBKIT_DIR/build/JSConfig/V8Config.vcproj',
- '$WEBKIT_DIR/build/V8Bindings/V8Bindings_prebuild.vcproj',
- ],
- guid='{5597AD47-3494-4750-A235-4F9C2F864700}')
+# 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() + +if env.Bit('windows'): + env.Prepend( + CCFLAGS = [ + '/TP', + + '/wd4244', + '/wd4291', + '/wd4345', + '/wd4521', + '/wd4800', + ],) +elif env.Bit('linux'): + env.Append( + # For the image readers and decoders: + CXXFLAGS = ["-Wno-sign-compare"], + LIBS = ['png'], + ) + +input_files = [ + '$PORT_DIR/platform/image-decoders/bmp/BMPImageDecoder.cpp', + '$PORT_DIR/platform/image-decoders/bmp/BMPImageReader.cpp', + '$PORT_DIR/platform/image-decoders/gif/GIFImageDecoder.cpp', + '$PORT_DIR/platform/image-decoders/gif/GIFImageReader.cpp', + '$PORT_DIR/platform/image-decoders/ico/ICOImageDecoder.cpp', + '$PORT_DIR/platform/image-decoders/jpeg/JPEGImageDecoder.cpp', + '$PORT_DIR/platform/image-decoders/png/PNGImageDecoder.cpp', + '$PORT_DIR/platform/image-decoders/xbm/XBMImageDecoder.cpp', +] + +if env.Bit('mac'): + # Mac specific implementations. + input_files.extend([ + '$PORT_DIR/platform/graphics/mac/FontCacheMacPending.cpp', + '$PORT_DIR/rendering/RenderThemeMac.mm', + ]) + +if env.get('KJS'): + # These actually no longer exist, but since JSC build is super-broken, we'll + # leave them here as stark reminders of our past. + input_files.extend([ + '$PORT_DIR/bridge/KJSBridge.cpp', + '$PORT_DIR/bridge/ScriptControllerKJS.cpp', + ]) +else: + input_files.extend([ + '$PORT_DIR/bindings/v8/ScriptController.cpp', + ]) + +env.ChromeLibrary("port", input_files) + +env.ChromeMSVSProject('$WEBKIT_DIR/build/port/port.vcproj', + name = 'Port', + dependencies = [ + '$WEBKIT_DIR/build/JSConfig/V8Config.vcproj', + '$WEBKIT_DIR/build/V8Bindings/V8Bindings_prebuild.vcproj', + ], + guid='{5597AD47-3494-4750-A235-4F9C2F864700}') |