summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-08 23:59:32 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-08 23:59:32 +0000
commitf940db87991e4417c7dbebabc95b8e3ff360a95f (patch)
tree153fcbf3bb73455c520ad286af64a9000ee9249d /webkit
parentfd26e207fdea97c98a8b6709a863583fa68f66c2 (diff)
downloadchromium_src-f940db87991e4417c7dbebabc95b8e3ff360a95f.zip
chromium_src-f940db87991e4417c7dbebabc95b8e3ff360a95f.tar.gz
chromium_src-f940db87991e4417c7dbebabc95b8e3ff360a95f.tar.bz2
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
Diffstat (limited to 'webkit')
-rw-r--r--webkit/SConscript.javascriptcore_pcre110
-rw-r--r--webkit/SConscript.port130
2 files changed, 120 insertions, 120 deletions
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}')