r107042 caused compile breakages on chromium try bots

https://bugs.webkit.org/show_bug.cgi?id=78125

Reviewed by Adam Barth.

Replace the copy script with a copies GYP action since the MSVS generator tracks dependencies on a per-file
basis.

* Platform.gyp/Platform.gyp:
* Platform.gyp/copy_webcore_headers.py: Removed.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@107110 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/Platform/ChangeLog b/Source/Platform/ChangeLog
index 3f96ff3..45c8504 100644 (file)
--- a/Source/Platform/ChangeLog
+++ b/Source/Platform/ChangeLog
@@ -1,3 +1,16 @@
+2012-02-08  James Robinson  <jamesr@chromium.org>
+
+        r107042 caused compile breakages on chromium try bots
+        https://bugs.webkit.org/show_bug.cgi?id=78125
+
+        Reviewed by Adam Barth.
+
+        Replace the copy script with a copies GYP action since the MSVS generator tracks dependencies on a per-file
+        basis.
+
+        * Platform.gyp/Platform.gyp:
+        * Platform.gyp/copy_webcore_headers.py: Removed.
+
 2012-02-07  James Robinson  <jamesr@chromium.org>
 
         [chromium] Move geometry headers in Platform API to Platform directory

diff --git a/Source/Platform/Platform.gyp/Platform.gyp b/Source/Platform/Platform.gyp/Platform.gyp
index 7b69f33..9182ab3 100644 (file)
--- a/Source/Platform/Platform.gyp/Platform.gyp
+++ b/Source/Platform/Platform.gyp/Platform.gyp
@@ -86,22 +86,12 @@
                     ],
                 }],
             ],
-            'actions': [
+            'copies': [
                 {
-                    'action_name': 'platform_api_copy_webcore_headers',
-                    'inputs': [
+                    'destination': '<(output_dir)',
+                    'files': [
                         '<@(webcore_headers)'
-                    ],
-                    'outputs': [
-                        '<(output_dir)/IntPoint.h' # Just have to depend on any one copied header
-                    ],
-                    'action': [
-                        'python',
-                        'copy_webcore_headers.py',
-                        '<(SHARED_INTERMEDIATE_DIR)/webcore_headers',
-                        '<@(webcore_headers)'
-                    ],
-                    'message': 'Copying WebCore headers needed by Platform API'
+                    ]
                 }
             ]
         }

diff --git a/Source/Platform/Platform.gyp/copy_webcore_headers.py b/Source/Platform/Platform.gyp/copy_webcore_headers.py
deleted file mode 100644 (file)
index cd2a38d..0000000
--- a/Source/Platform/Platform.gyp/copy_webcore_headers.py
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env python
-# Copyright (c) 2012 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:
-# 1.  Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-# 2.  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.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
-
-"""A helper script for copying WebCore/platform headers into a location the WebKit Platform API headers can include"""
-
-import errno
-import os
-import shutil
-import sys
-
-
-def CopyHeaders(dest_dir, headers):
-    try:
-        os.makedirs(dest_dir)
-    except OSError, e:
-        if e.errno != errno.EEXIST:
-            raise
-    for header in headers:
-        dest_filename = dest_dir + os.sep + header.split('/')[-1]
-        shutil.copyfile(header, dest_filename)
-
-
-def Main(argv):
-    dest_dir = argv[1]
-    headers = argv[2:]
-    CopyHeaders(dest_dir, headers)
-
-if __name__ == '__main__':
-    sys.exit(Main(sys.argv))