From 65f03d4f644ce73618e5f4f50dd694b26f55ae12 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Fri, 13 May 2011 16:23:25 +0100
Subject: Merge WebKit at r75993: Initial merge by git.

Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
---
 WebKit/chromium/gyp_webkit | 104 ---------------------------------------------
 1 file changed, 104 deletions(-)
 delete mode 100755 WebKit/chromium/gyp_webkit

(limited to 'WebKit/chromium/gyp_webkit')

diff --git a/WebKit/chromium/gyp_webkit b/WebKit/chromium/gyp_webkit
deleted file mode 100755
index b7d2308..0000000
--- a/WebKit/chromium/gyp_webkit
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/usr/bin/env python
-# Copyright (C) 2009 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.
-#
-
-# This file is used by gclient execute gyp with the proper command
-# line arguments.
-
-import glob
-import os
-import shlex
-import sys
-
-script_dir = os.path.dirname(__file__)
-
-sys.path.append(os.path.join(script_dir, 'tools', 'gyp', 'pylib'))
-import gyp
-
-def additional_include_files(args=[]):
-  """
-  Returns a list of additional (.gypi) files to include, without
-  duplicating ones that are already specified on the command line.
-  """
-  # Determine the include files specified on the command line.
-  # This doesn't cover all the different option formats you can use,
-  # but it's mainly intended to avoid duplicating flags on the automatic
-  # makefile regeneration which only uses this format.
-  specified_includes = set()
-  for arg in args:
-    if arg.startswith('-I') and len(arg) > 2:
-      specified_includes.add(os.path.realpath(arg[2:]))
-
-  result = []
-  def AddInclude(path):
-    if os.path.realpath(path) not in specified_includes:
-      result.append(path)
-
-  # Always include common.gypi
-  AddInclude(os.path.join(script_dir, 'build', 'common.gypi'))
-
-  # Optionally add supplemental .gypi files if present.
-  supplements = glob.glob(os.path.join(script_dir, '*', 'supplement.gypi'))
-  for supplement in supplements:
-    AddInclude(supplement)
-
-  return result
-
-if __name__ == '__main__':
-
-  args = sys.argv[1:]
-
-  # Add includes.
-  args.extend(['-I' + i for i in additional_include_files(args)])
-
-  # On linux, we want gyp to output a makefile (default is scons).
-  if sys.platform == 'linux2':
-    args.extend(['-fmake',
-                 '--suffix=.chromium',
-                 '--toplevel-dir=../..',
-                 # auto_regeneration doesn't work with toplevel-dir
-                 '-Gauto_regeneration=0'])
-
-  # Other command args:
-  args.extend([
-               # gyp variable defines.
-               '-Dinside_chromium_build=0',
-               '-Dv8_use_snapshot=false',
-               '-Dmsvs_use_common_release=0',
-
-               # gyp hack: otherwise gyp assumes its in chromium's src/ dir.
-               '--depth=./',
-
-               # gyp file to execute.
-               'WebKit.gyp'])
-
-  print 'Updating webkit projects from gyp files...'
-  sys.stdout.flush()
-
-  # Off we go...
-  sys.exit(gyp.main(args))
-- 
cgit v1.1