diff options
author | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-04 23:10:29 +0000 |
---|---|---|
committer | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-04 23:10:29 +0000 |
commit | 354ec1d7a43b6bf00475943e257d2ee741a076ae (patch) | |
tree | 2454edb3aef738669b1289fce46dc802257d7250 /build/SConscript.googleurl | |
parent | 01e845cfed07291c2ffe2d5e1004ee4217b1e233 (diff) | |
download | chromium_src-354ec1d7a43b6bf00475943e257d2ee741a076ae.zip chromium_src-354ec1d7a43b6bf00475943e257d2ee741a076ae.tar.gz chromium_src-354ec1d7a43b6bf00475943e257d2ee741a076ae.tar.bz2 |
Fix line-ending property on some SCons files.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@348 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/SConscript.googleurl')
-rw-r--r-- | build/SConscript.googleurl | 186 |
1 files changed, 93 insertions, 93 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) + |