Merge WebKit at r74534: Initial merge by git.

Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb

1 files changed, 0 insertions, 42 deletions

diff --git a/WebKitTools/WebKitTestRunner/win/build-generated-files.sh b/WebKitTools/WebKitTestRunner/win/build-generated-files.sh
deleted file mode 100644
index 8c599c1..0000000
--- a/WebKitTools/WebKitTestRunner/win/build-generated-files.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (C) 2010 Apple 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.
-
-# Calls to `cygpath -ms` below are needed to remove spaces from paths, which
-# confuse GNU make. See <http://webkit.org/b/8173>.
-
-WebKitOutputDir=$(cygpath -u "$(cygpath -ms "${1}")")
-WebKitLibrariesDir=$(cygpath -u "$(cygpath -ms "${2}")")
-DerivedSources="${WebKitOutputDir}/obj/InjectedBundle/DerivedSources"
-
-export WebKitTestRunner=$(cygpath -u "$(cygpath -ms "$(realpath ..)")")
-
-if [ -e "${WebKitOutputDir}/obj/WebCore/scripts" ]; then
-    export WebCoreScripts="${WebKitOutputDir}/obj/WebCore/scripts"
-else
-    export WebCoreScripts="${WebKitLibrariesDir}/tools/scripts"
-fi
-
-mkdir -p "${DerivedSources}"
-cd "${DerivedSources}"
-
-make -f "${WebKitTestRunner}/DerivedSources.make"