Add support for Linux kernels >=3.0-rc1 in Python related build files by:

 - replacing occurences of sys.platform == 'linux2' with
    sys.platform.startswith('linux')
 - congregating occurences of sys.platform in ('linux[X]', 'linuxY', ...)
    to sys.platform.startswith('linux')
  - adding the key 'linux3' to all relevant lookup dicts

BUG=85845
TEST=Try building chromium on Linux >=3.0-r1

Review URL: http://codereview.chromium.org/7172016

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

6 files changed, 16 insertions, 41 deletions

diff --git a/tools/code_coverage/coverage_posix.py b/tools/code_coverage/coverage_posix.py
index 25463a3..aaa400a 100755
--- a/tools/code_coverage/coverage_posix.py
+++ b/tools/code_coverage/coverage_posix.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 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.
 
@@ -547,7 +547,7 @@ class Coverage(object):
     return sys.platform == 'darwin'
 
   def IsLinux(self):
-    return sys.platform == 'linux2'
+    return sys.platform.startswith('linux')
 
   def IsWindows(self):
     """Return True if we are Windows."""
diff --git a/tools/code_coverage/process_coverage.py b/tools/code_coverage/process_coverage.py
index 8035974..8f6ccbf 100644
--- a/tools/code_coverage/process_coverage.py
+++ b/tools/code_coverage/process_coverage.py
@@ -1,33 +1,7 @@
-#!/usr/bin/python2.4
-#
-# 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.
+#!/usr/bin/python
+# Copyright (c) 2011 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.
 
 
 """Script to clean the lcov files and convert it to HTML
@@ -382,7 +356,7 @@ def main():
                     dest='platform',
                     default=None,
                     help=('Platform that the locv file was generated on. Must'
-                          'be one of {win32, linux2, macosx}'))
+                          'be one of {win32, linux2, linux3, macosx}'))
   parser.add_option('-s',
                     '--source',
                     dest='src_dir',
diff --git a/tools/coverity/coverity.py b/tools/coverity/coverity.py
index d19b622..2080e74 100644
--- a/tools/coverity/coverity.py
+++ b/tools/coverity/coverity.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 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.
 
@@ -135,7 +135,7 @@ def main(options, args):
   print 'Elapsed time: %ds' % (time.time() - start_time)
 
   # Do a clean build.  Remove the build output directory first.
-  if sys.platform == 'linux2':
+  if sys.platform.startswith('linux'):
     rm_path = os.path.join(options.source_dir,'src','out',options.target)
   elif sys.platform == 'win32':
     rm_path = os.path.join(options.source_dir,options.solution_dir,
@@ -165,7 +165,7 @@ def main(options, args):
   print 'Elapsed time: %ds' % (time.time() - start_time)
 
   use_shell_during_make = False
-  if sys.platform == 'linux2':
+  if sys.platform.startswith('linux'):
     use_shell_during_make = True
     os.chdir('src')
     _RunCommand('pwd', options.dry_run, shell=True)
diff --git a/tools/heapcheck/chrome_tests.py b/tools/heapcheck/chrome_tests.py
index 2f581ba..46e7b89 100755
--- a/tools/heapcheck/chrome_tests.py
+++ b/tools/heapcheck/chrome_tests.py
@@ -457,7 +457,7 @@ def _main(_):
 
 
 if __name__ == "__main__":
-  if sys.platform == 'linux2':
+  if sys.platform.startswith('linux'):
     ret = _main(sys.argv)
   else:
     logging.error("Heap checking works only on Linux at the moment.")
diff --git a/tools/python/google/platform_utils.py b/tools/python/google/platform_utils.py
index b2caa0f..1489fa2 100644
--- a/tools/python/google/platform_utils.py
+++ b/tools/python/google/platform_utils.py
@@ -1,5 +1,5 @@
 #!/bin/env python
-# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 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.
 
@@ -20,5 +20,5 @@ if sys.platform in ('cygwin', 'win32'):
   from platform_utils_win import *
 elif sys.platform == 'darwin':
   from platform_utils_mac import *
-elif sys.platform == 'linux2':
+elif sys.platform.startswith('linux'):
   from platform_utils_linux import *
diff --git a/tools/swig/swig.py b/tools/swig/swig.py
index 6ad9fdf..c363c27 100755
--- a/tools/swig/swig.py
+++ b/tools/swig/swig.py
@@ -1,6 +1,5 @@
 #!/usr/bin/python
-
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 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.
 
@@ -25,6 +24,7 @@ def main():
   dir_map = {
       'darwin': 'mac',
       'linux2': 'linux',
+      'linux3': 'linux',
       'win32':  'win',
   }
   # Swig documentation lies that platform macros are provided to swig
@@ -32,6 +32,7 @@ def main():
   platform_flags = {
       'darwin': '-DSWIGMAC',
       'linux2': '-DSWIGLINUX',
+      'linux3': '-DSWIGLINUX',
       'win32':  '-DSWIGWIN',
   }
   swig_bin = os.path.join(swig_dir, dir_map[sys.platform], 'swig')