Fix line-ending property on some SCons files.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@348 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 176 insertions, 176 deletions

diff --git a/build/SConscript.googleurl b/build/SConscript.googleurl
index 4be0e529..9998c885 100644
--- a/build/SConscript.googleurl
+++ b/build/SConscript.googleurl
@@ -1,93 +1,93 @@
-# 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.

-

-Import('env')

-

-env = env.Clone()

-

-env.Prepend(

-    CPPPATH = [

-        '$ICU38_DIR/public/common',

-        '$ICU38_DIR/public/i18n',

-        '#/..',

-    ],

-)

-

-env.Append(

-    CPPDEFINES = [

-        'U_STATIC_IMPLEMENTATION',

-    ],

-

-    CCFLAGS = [

-        '/TP',

-    ],

-)

-

-input_files = [

-    'src/gurl.cc',

-    'src/url_canon_etc.cc',

-    'src/url_canon_fileurl.cc',

-    'src/url_canon_host.cc',

-    'src/url_canon_icu.cc',

-    'src/url_canon_internal.cc',

-    'src/url_canon_ip.cc',

-    'src/url_canon_mailtourl.cc',

-    'src/url_canon_path.cc',

-    'src/url_canon_pathurl.cc',

-    'src/url_canon_query.cc',

-    'src/url_canon_relative.cc',

-    'src/url_canon_stdurl.cc',

-    'src/url_parse.cc',

-    'src/url_parse_file.cc',

-    'src/url_util.cc',

-]

-

-env.ChromeStaticLibrary('googleurl', input_files)

-

-

-# Commented out for now because we can't build googleurl unit tests

-# with gtest.  This will apparently be fixed some day...

-#

-#env_tests = env.Clone()

-#

-#env_tests.Append(

-#    CPPPATH = [

-#        '$GTEST_DIR/include',

-#    ],

-#)

-#

-#test_files = [

-#    'src/gurl_unittest.cc',

-#    'src/url_canon_unittest.cc',

-#    'src/url_parse_unittest.cc',

-#    'src/url_util_unittest.cc',

-#]

-#

-#env_tests.ChromeStaticLibrary('googleurl_tests', test_files)

-

+# 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.
+
+Import('env')
+
+env = env.Clone()
+
+env.Prepend(
+    CPPPATH = [
+        '$ICU38_DIR/public/common',
+        '$ICU38_DIR/public/i18n',
+        '#/..',
+    ],
+)
+
+env.Append(
+    CPPDEFINES = [
+        'U_STATIC_IMPLEMENTATION',
+    ],
+
+    CCFLAGS = [
+        '/TP',
+    ],
+)
+
+input_files = [
+    'src/gurl.cc',
+    'src/url_canon_etc.cc',
+    'src/url_canon_fileurl.cc',
+    'src/url_canon_host.cc',
+    'src/url_canon_icu.cc',
+    'src/url_canon_internal.cc',
+    'src/url_canon_ip.cc',
+    'src/url_canon_mailtourl.cc',
+    'src/url_canon_path.cc',
+    'src/url_canon_pathurl.cc',
+    'src/url_canon_query.cc',
+    'src/url_canon_relative.cc',
+    'src/url_canon_stdurl.cc',
+    'src/url_parse.cc',
+    'src/url_parse_file.cc',
+    'src/url_util.cc',
+]
+
+env.ChromeStaticLibrary('googleurl', input_files)
+
+
+# Commented out for now because we can't build googleurl unit tests
+# with gtest.  This will apparently be fixed some day...
+#
+#env_tests = env.Clone()
+#
+#env_tests.Append(
+#    CPPPATH = [
+#        '$GTEST_DIR/include',
+#    ],
+#)
+#
+#test_files = [
+#    'src/gurl_unittest.cc',
+#    'src/url_canon_unittest.cc',
+#    'src/url_parse_unittest.cc',
+#    'src/url_util_unittest.cc',
+#]
+#
+#env_tests.ChromeStaticLibrary('googleurl_tests', test_files)
+
diff --git a/build/SConscript.v8 b/build/SConscript.v8
index 2144509..d968f07 100644
--- a/build/SConscript.v8
+++ b/build/SConscript.v8
@@ -1,83 +1,83 @@
-# 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.

-

-Import('env')

-

-env = env.Clone()

-

-# Grungy environment hackery to satisfy the Visual Studio that we're

-# going to execute.

-import copy

-import os

-env['ENV'] = copy.deepcopy(os.environ)

-

-env.AppendENVPath('INCLUDE', env['MSVS_ENV']['INCLUDE'])

-env.AppendENVPath('LIB', env['MSVS_ENV']['LIB'])

-env.AppendENVPath('PATH', env['MSVS_ENV']['PATH'])

-

-

-mksnapshot_exe = File('#/../v8/bin/debug/mksnapshot.exe')

-v8_exe = File('#/../v8/Debug/v8_shell.exe')

-v8_lib = File('#/../v8/bin/debug/v8.lib'),

-

-v8_scons_targets = [

-    mksnapshot_exe,

-    v8_lib,

-    File('#/../v8/bin/debug/snapshot-empty.obj'),

-    File('#/../v8/vc80.pdb')

-]

-

-v8 = env.Command(v8_scons_targets,

-                 [],

-                 'cd ..\\v8 && $PYTHON $SCONS $SCONSFLAGS ${TARGETS[:-1]}',

-                 SCONS='..\\third_party\\scons\\scons.py',

-                 SCONSFLAGS='-Q --warn=no-deprecated')

-env.AlwaysBuild(v8)

-env.Install('$V8_DIR', v8)

-

-i = env.Install('$TARGET_ROOT', mksnapshot_exe)

-env.Alias('webkit', i)

-

-i = env.Install('$LIBS_DIR', v8_lib)

-env.Alias('webkit', i)

-

-

-v8_shell = env.Command(v8_exe,

-                       [],

-                       'cd ..\\v8 && devenv /nologo v8.sln /build Debug vcproj\\v8_shell.vcproj')

-env.AlwaysBuild(v8_shell)

-

-i = env.Install('$TARGET_ROOT', v8_exe)

-env.Alias('chrome', i)

-

-# By default, SCons deletes the target before invoking the command.

-# Tell SCons to *not* delete v8.lib and the other targets so the

-# subsidiary v8 SCons call doesn't always rebuild it (thereby causing

-# us to always rebuild things that use it).

-env.Precious(v8 + v8_shell)

+# 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.
+
+Import('env')
+
+env = env.Clone()
+
+# Grungy environment hackery to satisfy the Visual Studio that we're
+# going to execute.
+import copy
+import os
+env['ENV'] = copy.deepcopy(os.environ)
+
+env.AppendENVPath('INCLUDE', env['MSVS_ENV']['INCLUDE'])
+env.AppendENVPath('LIB', env['MSVS_ENV']['LIB'])
+env.AppendENVPath('PATH', env['MSVS_ENV']['PATH'])
+
+
+mksnapshot_exe = File('#/../v8/bin/debug/mksnapshot.exe')
+v8_exe = File('#/../v8/Debug/v8_shell.exe')
+v8_lib = File('#/../v8/bin/debug/v8.lib'),
+
+v8_scons_targets = [
+    mksnapshot_exe,
+    v8_lib,
+    File('#/../v8/bin/debug/snapshot-empty.obj'),
+    File('#/../v8/vc80.pdb')
+]
+
+v8 = env.Command(v8_scons_targets,
+                 [],
+                 'cd ..\\v8 && $PYTHON $SCONS $SCONSFLAGS ${TARGETS[:-1]}',
+                 SCONS='..\\third_party\\scons\\scons.py',
+                 SCONSFLAGS='-Q --warn=no-deprecated')
+env.AlwaysBuild(v8)
+env.Install('$V8_DIR', v8)
+
+i = env.Install('$TARGET_ROOT', mksnapshot_exe)
+env.Alias('webkit', i)
+
+i = env.Install('$LIBS_DIR', v8_lib)
+env.Alias('webkit', i)
+
+
+v8_shell = env.Command(v8_exe,
+                       [],
+                       'cd ..\\v8 && devenv /nologo v8.sln /build Debug vcproj\\v8_shell.vcproj')
+env.AlwaysBuild(v8_shell)
+
+i = env.Install('$TARGET_ROOT', v8_exe)
+env.Alias('chrome', i)
+
+# By default, SCons deletes the target before invoking the command.
+# Tell SCons to *not* delete v8.lib and the other targets so the
+# subsidiary v8 SCons call doesn't always rebuild it (thereby causing
+# us to always rebuild things that use it).
+env.Precious(v8 + v8_shell)