Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61

5 files changed, 87 insertions, 0 deletions

diff --git a/Source/gyp/common.gypi b/Source/gyp/common.gypi
new file mode 100644
index 0000000..892009c
--- /dev/null
+++ b/Source/gyp/common.gypi
@@ -0,0 +1,10 @@
+{
+  'target_defaults': {
+    'configurations': {
+      'Debug': {},
+      'Release': {},
+      'Production': {},
+    },
+    'default_configuration': 'Debug',
+  },
+}
diff --git a/Source/gyp/configure b/Source/gyp/configure
new file mode 100755
index 0000000..cd2b126
--- /dev/null
+++ b/Source/gyp/configure
@@ -0,0 +1,65 @@
+#!/usr/bin/env python
+# Copyright (c) 2011 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 os
+import subprocess
+
+
+PROJECTS = [
+    "JavaScriptGlue",
+    "JavaScriptCore",
+    "WebCore",
+]
+
+
+def create_project(project):
+    subprocess.call([
+        'gyp',  # FIXME: gyp shouldn't need to be in the PATH.
+        os.path.join(project, 'gyp', project + '.gyp'),
+        '-G',
+        'xcode_list_excluded_files=0',
+        '--depth=.',
+    ])
+
+
+def create_all_projects():
+    for project in PROJECTS:
+        create_project(project)
+
+
+def main():
+    source_directory = os.path.abspath(os.path.join(__file__, '..', '..'))
+    os.chdir(source_directory)
+    # FIXME: The user should be able to pass which port on the command line.
+    create_all_projects()
+
+
+if __name__ == "__main__":
+    main()
diff --git a/Source/gyp/remove-headers-if-needed.sh b/Source/gyp/remove-headers-if-needed.sh
new file mode 100644
index 0000000..4137859
--- /dev/null
+++ b/Source/gyp/remove-headers-if-needed.sh
@@ -0,0 +1,3 @@
+if (( TARGET_MAC_OS_X_VERSION_MAJOR > 1050 )); then
+    rm -rf \"$BUILT_PRODUCTS_DIR/$PUBLIC_HEADERS_FOLDER_PATH\"/*.h;
+fi
diff --git a/Source/gyp/run-if-exists.sh b/Source/gyp/run-if-exists.sh
new file mode 100644
index 0000000..242ffc8
--- /dev/null
+++ b/Source/gyp/run-if-exists.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if [ -f $1 ]; then
+    $1 || exit $?;
+fi
diff --git a/Source/gyp/update-info-plist.sh b/Source/gyp/update-info-plist.sh
new file mode 100755
index 0000000..d02ecce
--- /dev/null
+++ b/Source/gyp/update-info-plist.sh
@@ -0,0 +1,4 @@
+# Touch Info.plist to let Xcode know it needs to copy it into the built product
+if [[ "${CONFIGURATION}" != "Production" ]]; then
+    touch "$1";
+fi