Diff
Modified: trunk/Tools/ChangeLog (197357 => 197358)
--- trunk/Tools/ChangeLog 2016-02-29 18:05:17 UTC (rev 197357)
+++ trunk/Tools/ChangeLog 2016-02-29 18:33:24 UTC (rev 197358)
@@ -1,3 +1,16 @@
+2016-02-29 Csaba Osztrogonác <o...@webkit.org>
+
+ Remove more LLVM related cruft
+ https://bugs.webkit.org/show_bug.cgi?id=154821
+
+ Reviewed by Darin Adler.
+
+ * Scripts/build-jsc:
+ * Scripts/build-webkit:
+ * Scripts/copy-webkitlibraries-to-product-directory:
+ * Scripts/export-llvm-build: Removed.
+ * Scripts/run-jsc-stress-tests:
+
2016-02-28 Sam Weinig <s...@webkit.org>
Reimplement WKPageGroup in terms of WKUserContentController
Modified: trunk/Tools/Scripts/build-jsc (197357 => 197358)
--- trunk/Tools/Scripts/build-jsc 2016-02-29 18:05:17 UTC (rev 197357)
+++ trunk/Tools/Scripts/build-jsc 2016-02-29 18:33:24 UTC (rev 197358)
@@ -126,9 +126,6 @@
if ($copyLibraries) {
my @copyLibrariesArgs = ("perl", "Tools/Scripts/copy-webkitlibraries-to-product-directory");
push @copyLibrariesArgs, "--device" if willUseIOSDeviceSDK();
- if ($ftlJIT) {
- push @copyLibrariesArgs, "--llvm";
- }
push @copyLibrariesArgs, productDir();
(system(@copyLibrariesArgs) == 0) or die;
}
Modified: trunk/Tools/Scripts/build-webkit (197357 => 197358)
--- trunk/Tools/Scripts/build-webkit 2016-02-29 18:05:17 UTC (rev 197357)
+++ trunk/Tools/Scripts/build-webkit 2016-02-29 18:33:24 UTC (rev 197358)
@@ -189,19 +189,11 @@
splice(@projects, $webKitIndex, 0, "Source/WebInspectorUI");
# Copy library and header from WebKitLibraries to a findable place in the product directory.
- my @copyLibrariesArgs = ("perl", "Tools/Scripts/copy-webkitlibraries-to-product-directory", "--wksi", "--llvm", productDir());
+ my @copyLibrariesArgs = ("perl", "Tools/Scripts/copy-webkitlibraries-to-product-directory", "--wksi", productDir());
print(join(" ", @copyLibrariesArgs) . "\n");
(system(@copyLibrariesArgs) == 0) or die;
} else {
my @copyLibrariesArgs = ("perl", "Tools/Scripts/copy-webkitlibraries-to-product-directory", "--sdk", xcodeSDK(), "--wksi");
- push @copyLibrariesArgs, "--llvm" if willUseIOSDeviceSDK();
- if (my $hasInternalSDK = xcodeSDK() eq "iphoneos.internal") {
- push @copyLibrariesArgs, (
- "--prefer-system-llvm",
- "--llvm-subdirectory", "internal-llvm",
- "--llvm-prefix", "/usr/local",
- );
- }
push @copyLibrariesArgs, productDir();
print(join(" ", @copyLibrariesArgs) . "\n");
(system(@copyLibrariesArgs) == 0) or die;
Modified: trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory (197357 => 197358)
--- trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2016-02-29 18:05:17 UTC (rev 197357)
+++ trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2016-02-29 18:33:24 UTC (rev 197358)
@@ -31,15 +31,9 @@
use webkitdirs;
my $showHelp = 0;
-my $llvm = 0;
my $wksi = 0;
my $clean = 0;
-my $llvmIncludePackage = "";
-my $llvmLibraryPackage = "";
my $useFullLibPaths = 0;
-my $preferSystemLLVMOverDrops = 0;
-my $llvmSubdirectoryName = "llvm";
-my $llvmPrefix = willUseIOSDeviceSDK() ? "/usr/local" : "/usr/local/LLVMForJavaScriptCore";
my $osxVersion;
my $force = 0;
@@ -59,15 +53,9 @@
GetOptions(
'help' => \$showHelp,
- 'llvm!' => \$llvm,
'wksi!' => \$wksi,
'clean' => \$clean,
- 'use-llvm-includes=s' => \$llvmIncludePackage,
- 'use-llvm-libraries=s' => \$llvmLibraryPackage,
'use-full-lib-paths!' => \$useFullLibPaths,
- 'prefer-system-llvm!' => \$preferSystemLLVMOverDrops,
- 'llvm-subdirectory=s' => \$llvmSubdirectoryName,
- 'llvm-prefix=s' => \$llvmPrefix,
'osx-version=s' => \$osxVersion,
'force!' => \$force
);
@@ -170,13 +158,6 @@
dittoHeaders("WebKitLibraries/WebKitSystemInterface.h", "$productDir/usr/local/include/WebKitSystemInterface.h");
}
-if ($llvm) {
- # We have various scripts that call this script and pass LLVM-related options. So, we sort of
- # silently ignore them for now. We should remove this once we confirm that we've axed all of the
- # LLVM support everywhere.
- print "Warning: we no longer depend on LLVM so this script does nothing for LLVM. LLVM-related options will be removed soon.\n";
-}
-
sub fileContains
{
my ($filename, $string) = @_;
Deleted: trunk/Tools/Scripts/export-llvm-build (197357 => 197358)
--- trunk/Tools/Scripts/export-llvm-build 2016-02-29 18:05:17 UTC (rev 197357)
+++ trunk/Tools/Scripts/export-llvm-build 2016-02-29 18:33:24 UTC (rev 197358)
@@ -1,171 +0,0 @@
-#!/usr/bin/env ruby
-
-# Copyright (C) 2013, 2014 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 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 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.
-
-require 'getoptlong'
-require 'pathname'
-require 'shellwords'
-require 'tmpdir'
-
-def mychdir(path)
- puts "-> #{path.to_s}"
- Dir.chdir(path) {
- yield
- }
- puts "<- #{path.to_s}"
-end
-
-def mysys(*cmd)
- cmd = cmd.map{|value| value.to_s}
- commandArray = cmd.map{|value| Shellwords.shellescape(value)}.join(' ')
- $stderr.puts " $ #{commandArray}"
- raise unless system(*cmd)
-end
-
-$libraryPackage = Pathname.new("LLVMLibraries.tar.bz2")
-$includePackage = Pathname.new("LLVMIncludes.tar.bz2")
-$llvmBuild = Pathname.new("./llvm")
-$llvmBinary = Pathname.new("./llvm/Release")
-$llvmSource = Pathname.new("./llvm")
-$prefix = nil
-$compression = "bzip2"
-
-def usage
- puts "export-llvm-build"
- puts
- puts "--library-package (-l) Change where to put the compressed library package."
- puts " Default is #{$libraryPackage}."
- puts "--include-package (-i) Change wehre to put the compressed header package."
- puts " Default is #{$includePackage}."
- puts "--llvm-build (-b) Change which LLVM build directory to use."
- puts " Default is #{$llvmBuild}."
- puts "--llvm-binary (-B) Change which LLVM binary directory to use."
- puts " Default is #{$llvmBinary}."
- puts "--llvm-source (-s) Change which LLVM source directory to use."
- puts " Default is #{$llvmSource}."
- puts "--prefix (-p) Use an \"installed\" LLVM with the given prefix."
- puts "--compression Change what compression to do. Can be one of gzip,"
- puts " bzip2, or none."
- puts " Default is #{$compression}."
- exit 1
-end
-
-GetoptLong.new(['--help', '-h', GetoptLong::NO_ARGUMENT],
- ['--library-package', '-l', GetoptLong::REQUIRED_ARGUMENT],
- ['--include-package', '-i', GetoptLong::REQUIRED_ARGUMENT],
- ['--llvm-build', '-b', GetoptLong::REQUIRED_ARGUMENT],
- ['--llvm-binary', '-B', GetoptLong::REQUIRED_ARGUMENT],
- ['--llvm-source', '-s', GetoptLong::REQUIRED_ARGUMENT],
- ['--prefix', '-p', GetoptLong::REQUIRED_ARGUMENT],
- ['--compression', GetoptLong::REQUIRED_ARGUMENT]).each {
- | opt, arg |
- case opt
- when '--help'
- usage
- when '--library-package'
- $libraryPackage = Pathname.new(arg)
- when '--include-package'
- $includePackage = Pathname.new(arg)
- when '--llvm-build'
- $llvmBuild = Pathname.new(arg)
- when '--llvm-binary'
- $llvmBinary = Pathname.new(arg)
- when '--llvm-source'
- $llvmSource = Pathname.new(arg)
- when '--prefix'
- $prefix = Pathname.new(arg)
- when '--compression'
- $compression = arg
- else
- raise
- end
-}
-
-$currentPath = Pathname.pwd
-
-def compressionChar
- case $compression
- when "gzip"
- "z"
- when "bzip2"
- "y"
- when "none"
- ""
- else
- raise "Bad choice of compression."
- end
-end
-
-if $prefix
- $llvmBinary = $prefix
- $llvmBuild = $prefix
- $llvmSource = $prefix
-end
-
-mychdir($llvmBinary + "lib") {
- mysys("tar", "-c#{compressionChar}vf", ($currentPath + $libraryPackage).to_s,
- *Dir.entries('.').select {
- | value |
- value =~ /\.a$/ and value !~ /libgtest/
- })
-}
-
-Dir.mktmpdir {
- | directory |
- directory = Pathname.new(directory).realpath
- mychdir($llvmSource) {
- begin
- mysys("svn", "export", "include", directory + "include")
- rescue
- mysys("ditto", "include", directory + "include")
- end
- }
- ["include/llvm/Config"].each {
- | genDirName |
- configSrcPath = $llvmBuild + genDirName
- raise unless configSrcPath.directory?
- configDstPath = directory + genDirName
- Dir.foreach(configSrcPath) {
- | filename |
- next unless filename =~ /\.def$/ or filename =~ /\.h$/
- mysys("cp", configSrcPath + filename, configDstPath + filename)
- }
- }
- ["include/llvm/Support/DataTypes.h"].each {
- | genFileName |
- mysys("cp", $llvmBuild + genFileName, directory + genFileName)
- }
- mychdir(directory + "include") {
- mysys("tar", "-cyvf", $currentPath + $includePackage, ".")
- }
-}
-
-puts
-puts "LLVM has been packaged for use by WebKit."
-puts
-puts "You can use it right now by setting these environment variables:"
-puts
-puts "export LLVM_LIBRARY_PACKAGE=#{Shellwords.shellescape($libraryPackage.realpath.to_s)}"
-puts "export LLVM_INCLUDE_PACKAGE=#{Shellwords.shellescape($includePackage.realpath.to_s)}"
-puts
Modified: trunk/Tools/Scripts/run-jsc-stress-tests (197357 => 197358)
--- trunk/Tools/Scripts/run-jsc-stress-tests 2016-02-29 18:05:17 UTC (rev 197357)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2016-02-29 18:33:24 UTC (rev 197358)
@@ -1476,13 +1476,6 @@
end
if $remote and $hostOS == "linux"
- if $enableFTL
- begin
- FileUtils.cp_r originalJSCPath + "../../lib/libllvmForJSC.so" , $jscPath.dirname
- rescue
- $stderr.puts "Warning: unable to copy libllvmForJSC.so to the bundle."
- end
- end
begin
dependencies = `ldd #{source}`
dependencies.split(/\n/).each {
