<!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>[163198] 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/163198">163198</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-01-31 13:59:39 -0800 (Fri, 31 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Having a custom LLVM checkout should always override all other ways of getting LLVM
https://bugs.webkit.org/show_bug.cgi?id=128015
Reviewed by Oliver Hunt.
* Scripts/copy-webkitlibraries-to-product-directory:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptscopywebkitlibrariestoproductdirectory">trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (163197 => 163198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-31 21:59:02 UTC (rev 163197)
+++ trunk/Tools/ChangeLog 2014-01-31 21:59:39 UTC (rev 163198)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-01-31 Filip Pizlo <fpizlo@apple.com>
+
+ Having a custom LLVM checkout should always override all other ways of getting LLVM
+ https://bugs.webkit.org/show_bug.cgi?id=128015
+
+ Reviewed by Oliver Hunt.
+
+ * Scripts/copy-webkitlibraries-to-product-directory:
+
</ins><span class="cx"> 2014-01-31 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKit Bot Watcher's Dashboard: Teach JSON.load() to take optional failure callback function
</span></span></pre></div>
<a id="trunkToolsScriptscopywebkitlibrariestoproductdirectory"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory (163197 => 163198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2014-01-31 21:59:02 UTC (rev 163197)
+++ trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2014-01-31 21:59:39 UTC (rev 163198)
</span><span class="lines">@@ -122,35 +122,35 @@
</span><span class="cx"> my $majorDarwinVersion = (split /\./, `uname -r`)[0];
</span><span class="cx"> my $useOwnLLVM = 0;
</span><span class="cx"> my $ownLLVMDirectory;
</span><del>- if ($llvmLibraryPackage eq "" && $llvmIncludePackage eq "") {
- if (defined($ENV{LLVM_SOURCE_PATH})) {
- $useOwnLLVM = 1;
- $ownLLVMDirectory = $ENV{LLVM_SOURCE_PATH};
- } elsif (-d "llvm" && -e "llvm/LLVMBuild.txt") {
- $useOwnLLVM = 1;
- $ownLLVMDirectory = sourceDir() . "/llvm";
- } elsif (defined($ENV{LLVM_LIBRARY_PACKAGE}) && defined($ENV{LLVM_INCLUDE_PACKAGE})) {
- $llvmLibraryPackage = $ENV{LLVM_LIBRARY_PACKAGE};
- $llvmIncludePackage = $ENV{LLVM_INCLUDE_PACKAGE};
- } elsif ($majorDarwinVersion == 11) {
- $llvmLibraryPackage = "WebKitLibraries/LLVMLibrariesLion.tar.bz2";
- $llvmIncludePackage = "WebKitLibraries/LLVMIncludesLion.tar.bz2";
- } elsif ($majorDarwinVersion == 12) {
- $llvmLibraryPackage = "WebKitLibraries/LLVMLibrariesMountainLion.tar.bz2";
- $llvmIncludePackage = "WebKitLibraries/LLVMIncludesMountainLion.tar.bz2";
- } elsif ($majorDarwinVersion == 13) {
- $llvmLibraryPackage = "WebKitLibraries/LLVMLibrariesMavericks.tar.bz2";
- $llvmIncludePackage = "WebKitLibraries/LLVMIncludesMavericks.tar.bz2";
- } else {
- print "Don't know where to find LLVM!\n";
- print "\n";
- print "Try defining LLVM_LIBRARY_PACKAGE and LLVM_INCLUDE_PACKAGE or setting the\n";
- print "--use-llvm-includes and --use-llvm-libraries options.\n";
- print "\n";
- print "Alternatively, you can check out llvm trunk into the WebKit directory:\n";
- print "svn co http://llvm.org/svn/llvm-project/llvm/trunk llvm\n";
- exit 1;
- }
</del><ins>+ if (defined($ENV{LLVM_SOURCE_PATH})) {
+ $useOwnLLVM = 1;
+ $ownLLVMDirectory = $ENV{LLVM_SOURCE_PATH};
+ } elsif (-d "llvm" && -e "llvm/LLVMBuild.txt") {
+ $useOwnLLVM = 1;
+ $ownLLVMDirectory = sourceDir() . "/llvm";
+ } elsif ($llvmLibraryPackage ne "" && $llvmIncludePackage ne "") {
+ # Command-line arguments override our other ways of finding the packages.
+ } elsif (defined($ENV{LLVM_LIBRARY_PACKAGE}) && defined($ENV{LLVM_INCLUDE_PACKAGE})) {
+ $llvmLibraryPackage = $ENV{LLVM_LIBRARY_PACKAGE};
+ $llvmIncludePackage = $ENV{LLVM_INCLUDE_PACKAGE};
+ } elsif ($majorDarwinVersion == 11) {
+ $llvmLibraryPackage = "WebKitLibraries/LLVMLibrariesLion.tar.bz2";
+ $llvmIncludePackage = "WebKitLibraries/LLVMIncludesLion.tar.bz2";
+ } elsif ($majorDarwinVersion == 12) {
+ $llvmLibraryPackage = "WebKitLibraries/LLVMLibrariesMountainLion.tar.bz2";
+ $llvmIncludePackage = "WebKitLibraries/LLVMIncludesMountainLion.tar.bz2";
+ } elsif ($majorDarwinVersion == 13) {
+ $llvmLibraryPackage = "WebKitLibraries/LLVMLibrariesMavericks.tar.bz2";
+ $llvmIncludePackage = "WebKitLibraries/LLVMIncludesMavericks.tar.bz2";
+ } else {
+ print "Don't know where to find LLVM!\n";
+ print "\n";
+ print "Try defining LLVM_LIBRARY_PACKAGE and LLVM_INCLUDE_PACKAGE or setting the\n";
+ print "--use-llvm-includes and --use-llvm-libraries options.\n";
+ print "\n";
+ print "Alternatively, you can check out llvm trunk into the WebKit directory:\n";
+ print "svn co http://llvm.org/svn/llvm-project/llvm/trunk llvm\n";
+ exit 1;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub fileContains
</span></span></pre>
</div>
</div>
</body>
</html>