<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[197358] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/197358">197358</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-29 10:33:24 -0800 (Mon, 29 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsbuildjsc">trunk/Tools/Scripts/build-jsc</a></li>
<li><a href="#trunkToolsScriptsbuildwebkit">trunk/Tools/Scripts/build-webkit</a></li>
<li><a href="#trunkToolsScriptscopywebkitlibrariestoproductdirectory">trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory</a></li>
<li><a href="#trunkToolsScriptsrunjscstresstests">trunk/Tools/Scripts/run-jsc-stress-tests</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkToolsScriptsexportllvmbuild">trunk/Tools/Scripts/export-llvm-build</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (197357 => 197358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-02-29 18:05:17 UTC (rev 197357)
+++ trunk/Tools/ChangeLog 2016-02-29 18:33:24 UTC (rev 197358)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-02-29 Csaba Osztrogonác <ossy@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:
+
</ins><span class="cx"> 2016-02-28 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Reimplement WKPageGroup in terms of WKUserContentController
</span></span></pre></div>
<a id="trunkToolsScriptsbuildjsc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-jsc (197357 => 197358)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -126,9 +126,6 @@
</span><span class="cx"> if ($copyLibraries) {
</span><span class="cx"> my @copyLibrariesArgs = ("perl", "Tools/Scripts/copy-webkitlibraries-to-product-directory");
</span><span class="cx"> push @copyLibrariesArgs, "--device" if willUseIOSDeviceSDK();
</span><del>- if ($ftlJIT) {
- push @copyLibrariesArgs, "--llvm";
- }
</del><span class="cx"> push @copyLibrariesArgs, productDir();
</span><span class="cx"> (system(@copyLibrariesArgs) == 0) or die;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsScriptsbuildwebkit"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-webkit (197357 => 197358)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -189,19 +189,11 @@
</span><span class="cx"> splice(@projects, $webKitIndex, 0, "Source/WebInspectorUI");
</span><span class="cx">
</span><span class="cx"> # Copy library and header from WebKitLibraries to a findable place in the product directory.
</span><del>- my @copyLibrariesArgs = ("perl", "Tools/Scripts/copy-webkitlibraries-to-product-directory", "--wksi", "--llvm", productDir());
</del><ins>+ my @copyLibrariesArgs = ("perl", "Tools/Scripts/copy-webkitlibraries-to-product-directory", "--wksi", productDir());
</ins><span class="cx"> print(join(" ", @copyLibrariesArgs) . "\n");
</span><span class="cx"> (system(@copyLibrariesArgs) == 0) or die;
</span><span class="cx"> } else {
</span><span class="cx"> my @copyLibrariesArgs = ("perl", "Tools/Scripts/copy-webkitlibraries-to-product-directory", "--sdk", xcodeSDK(), "--wksi");
</span><del>- 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",
- );
- }
</del><span class="cx"> push @copyLibrariesArgs, productDir();
</span><span class="cx"> print(join(" ", @copyLibrariesArgs) . "\n");
</span><span class="cx"> (system(@copyLibrariesArgs) == 0) or die;
</span></span></pre></div>
<a id="trunkToolsScriptscopywebkitlibrariestoproductdirectory"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory (197357 => 197358)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -31,15 +31,9 @@
</span><span class="cx"> use webkitdirs;
</span><span class="cx">
</span><span class="cx"> my $showHelp = 0;
</span><del>-my $llvm = 0;
</del><span class="cx"> my $wksi = 0;
</span><span class="cx"> my $clean = 0;
</span><del>-my $llvmIncludePackage = "";
-my $llvmLibraryPackage = "";
</del><span class="cx"> my $useFullLibPaths = 0;
</span><del>-my $preferSystemLLVMOverDrops = 0;
-my $llvmSubdirectoryName = "llvm";
-my $llvmPrefix = willUseIOSDeviceSDK() ? "/usr/local" : "/usr/local/LLVMForJavaScriptCore";
</del><span class="cx"> my $osxVersion;
</span><span class="cx"> my $force = 0;
</span><span class="cx">
</span><span class="lines">@@ -59,15 +53,9 @@
</span><span class="cx">
</span><span class="cx"> GetOptions(
</span><span class="cx"> 'help' => \$showHelp,
</span><del>- 'llvm!' => \$llvm,
</del><span class="cx"> 'wksi!' => \$wksi,
</span><span class="cx"> 'clean' => \$clean,
</span><del>- 'use-llvm-includes=s' => \$llvmIncludePackage,
- 'use-llvm-libraries=s' => \$llvmLibraryPackage,
</del><span class="cx"> 'use-full-lib-paths!' => \$useFullLibPaths,
</span><del>- 'prefer-system-llvm!' => \$preferSystemLLVMOverDrops,
- 'llvm-subdirectory=s' => \$llvmSubdirectoryName,
- 'llvm-prefix=s' => \$llvmPrefix,
</del><span class="cx"> 'osx-version=s' => \$osxVersion,
</span><span class="cx"> 'force!' => \$force
</span><span class="cx"> );
</span><span class="lines">@@ -170,13 +158,6 @@
</span><span class="cx"> dittoHeaders("WebKitLibraries/WebKitSystemInterface.h", "$productDir/usr/local/include/WebKitSystemInterface.h");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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";
-}
-
</del><span class="cx"> sub fileContains
</span><span class="cx"> {
</span><span class="cx"> my ($filename, $string) = @_;
</span></span></pre></div>
<a id="trunkToolsScriptsexportllvmbuild"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/Scripts/export-llvm-build (197357 => 197358)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,171 +0,0 @@
</span><del>-#!/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
</del></span></pre></div>
<a id="trunkToolsScriptsrunjscstresstests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-jsc-stress-tests (197357 => 197358)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1476,13 +1476,6 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> if $remote and $hostOS == "linux"
</span><del>- 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
</del><span class="cx"> begin
</span><span class="cx"> dependencies = `ldd #{source}`
</span><span class="cx"> dependencies.split(/\n/).each {
</span></span></pre>
</div>
</div>
</body>
</html>