<!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>[167334] trunk</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/167334">167334</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-04-15 16:25:38 -0700 (Tue, 15 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>
Tools: Update LLVM export scrpt to handle the build directory being different from the
source directory.
Rubber stamped by Geoffrey Garen.
* Scripts/export-llvm-build:
WebKitLibraries: Add LLVM binary drops for Mavericks using LLVM <a href="http://trac.webkit.org/projects/webkit/changeset/206312">r206312</a>.
Rubber stamped by Geoffrey Garen.
* LLVMIncludesMavericks.tar.bz2: Added.
* LLVMLibrariesMavericks.tar.bz2: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsexportllvmbuild">trunk/Tools/Scripts/export-llvm-build</a></li>
<li><a href="#trunkWebKitLibrariesChangeLog">trunk/WebKitLibraries/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkWebKitLibrariesLLVMIncludesMaverickstarbz2">trunk/WebKitLibraries/LLVMIncludesMavericks.tar.bz2</a></li>
<li><a href="#trunkWebKitLibrariesLLVMLibrariesMaverickstarbz2">trunk/WebKitLibraries/LLVMLibrariesMavericks.tar.bz2</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (167333 => 167334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-04-15 23:21:07 UTC (rev 167333)
+++ trunk/Tools/ChangeLog 2014-04-15 23:25:38 UTC (rev 167334)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-04-15 Filip Pizlo <fpizlo@apple.com>
+
+ Update LLVM export scrpt to handle the build directory being different from the
+ source directory.
+
+ Rubber stamped by Geoffrey Garen.
+
+ * Scripts/export-llvm-build:
+
</ins><span class="cx"> 2014-04-15 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Update the hyperlink to waterfall views of perf bots on build.webkit.org
</span></span></pre></div>
<a id="trunkToolsScriptsexportllvmbuild"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/export-llvm-build (167333 => 167334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/export-llvm-build 2014-04-15 23:21:07 UTC (rev 167333)
+++ trunk/Tools/Scripts/export-llvm-build 2014-04-15 23:25:38 UTC (rev 167334)
</span><span class="lines">@@ -28,27 +28,41 @@
</span><span class="cx"> require 'shellwords'
</span><span class="cx"> require 'tmpdir'
</span><span class="cx">
</span><ins>+def mychdir(path)
+ puts "-> #{path.to_s}"
+ Dir.chdir(path) {
+ yield
+ }
+ puts "<- #{path.to_s}"
+end
+
</ins><span class="cx"> def mysys(*cmd)
</span><span class="cx"> cmd = cmd.map{|value| value.to_s}
</span><span class="cx"> commandArray = cmd.map{|value| Shellwords.shellescape(value)}.join(' ')
</span><del>- $stderr.puts ">> #{commandArray}"
</del><ins>+ $stderr.puts " $ #{commandArray}"
</ins><span class="cx"> raise unless system(*cmd)
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> $libraryPackage = Pathname.new("LLVMLibraries.tar.bz2")
</span><span class="cx"> $includePackage = Pathname.new("LLVMIncludes.tar.bz2")
</span><del>-$llvmBuild = "Release+Asserts"
</del><ins>+$llvmBuild = Pathname.new("./llvm")
+$llvmBinary = Pathname.new("./llvm/Release")
+$llvmSource = Pathname.new("./llvm")
</ins><span class="cx"> $compression = "bzip2"
</span><span class="cx">
</span><span class="cx"> def usage
</span><del>- puts "export-llvm-build <LLVM directory>"
</del><ins>+ puts "export-llvm-build"
</ins><span class="cx"> puts
</span><span class="cx"> puts "--library-package (-l) Change where to put the compressed library package."
</span><span class="cx"> puts " Default is #{$libraryPackage}."
</span><span class="cx"> puts "--include-package (-i) Change wehre to put the compressed header package."
</span><span class="cx"> puts " Default is #{$includePackage}."
</span><del>- puts "--llvm-build (-b) Change which LLVM build to use."
</del><ins>+ puts "--llvm-build (-b) Change which LLVM build directory to use."
</ins><span class="cx"> puts " Default is #{$llvmBuild}."
</span><ins>+ 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}."
</ins><span class="cx"> puts "--compression Change what compression to do. Can be one of gzip,"
</span><span class="cx"> puts " bzip2, or none."
</span><span class="cx"> puts " Default is #{$compression}."
</span><span class="lines">@@ -59,6 +73,8 @@
</span><span class="cx"> ['--library-package', '-l', GetoptLong::REQUIRED_ARGUMENT],
</span><span class="cx"> ['--include-package', '-i', GetoptLong::REQUIRED_ARGUMENT],
</span><span class="cx"> ['--llvm-build', '-b', GetoptLong::REQUIRED_ARGUMENT],
</span><ins>+ ['--llvm-binary', '-B', GetoptLong::REQUIRED_ARGUMENT],
+ ['--llvm-source', '-s', GetoptLong::REQUIRED_ARGUMENT],
</ins><span class="cx"> ['--compression', GetoptLong::REQUIRED_ARGUMENT]).each {
</span><span class="cx"> | opt, arg |
</span><span class="cx"> case opt
</span><span class="lines">@@ -69,7 +85,11 @@
</span><span class="cx"> when '--include-package'
</span><span class="cx"> $includePackage = Pathname.new(arg)
</span><span class="cx"> when '--llvm-build'
</span><del>- $llvmBuild = arg
</del><ins>+ $llvmBuild = Pathname.new(arg)
+ when '--llvm-binary'
+ $llvmBinary = Pathname.new(arg)
+ when '--llvm-source'
+ $llvmSource = Pathname.new(arg)
</ins><span class="cx"> when '--compression'
</span><span class="cx"> $compression = arg
</span><span class="cx"> else
</span><span class="lines">@@ -77,12 +97,6 @@
</span><span class="cx"> end
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if ARGV.length != 1
- usage
-end
-
-$llvmPath = Pathname.new(ARGV[0])
-
</del><span class="cx"> $currentPath = Pathname.pwd
</span><span class="cx">
</span><span class="cx"> def compressionChar
</span><span class="lines">@@ -98,7 +112,7 @@
</span><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx">
</span><del>-Dir.chdir($llvmPath + $llvmBuild + "lib") {
</del><ins>+mychdir($llvmBinary + "lib") {
</ins><span class="cx"> mysys("tar", "-c#{compressionChar}vf", ($currentPath + $libraryPackage).to_s,
</span><span class="cx"> *Dir.entries('.').select {
</span><span class="cx"> | value |
</span><span class="lines">@@ -109,7 +123,7 @@
</span><span class="cx"> Dir.mktmpdir {
</span><span class="cx"> | directory |
</span><span class="cx"> directory = Pathname.new(directory).realpath
</span><del>- Dir.chdir($llvmPath) {
</del><ins>+ mychdir($llvmSource) {
</ins><span class="cx"> begin
</span><span class="cx"> mysys("svn", "export", "include", directory + "include")
</span><span class="cx"> rescue
</span><span class="lines">@@ -118,7 +132,8 @@
</span><span class="cx"> }
</span><span class="cx"> ["include/llvm/Config"].each {
</span><span class="cx"> | genDirName |
</span><del>- configSrcPath = $llvmPath + genDirName
</del><ins>+ configSrcPath = $llvmBuild + genDirName
+ raise unless configSrcPath.directory?
</ins><span class="cx"> configDstPath = directory + genDirName
</span><span class="cx"> Dir.foreach(configSrcPath) {
</span><span class="cx"> | filename |
</span><span class="lines">@@ -128,9 +143,9 @@
</span><span class="cx"> }
</span><span class="cx"> ["include/llvm/Support/DataTypes.h"].each {
</span><span class="cx"> | genFileName |
</span><del>- mysys("cp", $llvmPath + genFileName, directory + genFileName)
</del><ins>+ mysys("cp", $llvmBuild + genFileName, directory + genFileName)
</ins><span class="cx"> }
</span><del>- Dir.chdir(directory + "include") {
</del><ins>+ mychdir(directory + "include") {
</ins><span class="cx"> mysys("tar", "-cyvf", $currentPath + $includePackage, ".")
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkWebKitLibrariesChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/ChangeLog (167333 => 167334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/ChangeLog 2014-04-15 23:21:07 UTC (rev 167333)
+++ trunk/WebKitLibraries/ChangeLog 2014-04-15 23:25:38 UTC (rev 167334)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-04-15 Filip Pizlo <fpizlo@apple.com>
+
+ Add LLVM binary drops for Mavericks using LLVM r206312.
+
+ Rubber stamped by Geoffrey Garen.
+
+ * LLVMIncludesMavericks.tar.bz2: Added.
+ * LLVMLibrariesMavericks.tar.bz2: Added.
+
</ins><span class="cx"> 2014-04-03 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Enable the CSS_GRID_LAYOUT feature.
</span></span></pre></div>
<a id="trunkWebKitLibrariesLLVMIncludesMaverickstarbz2"></a>
<div class="binary"><h4>Added: trunk/WebKitLibraries/LLVMIncludesMavericks.tar.bz2</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/WebKitLibraries/LLVMIncludesMavericks.tar.bz2
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkWebKitLibrariesLLVMLibrariesMaverickstarbz2"></a>
<div class="binary"><h4>Added: trunk/WebKitLibraries/LLVMLibrariesMavericks.tar.bz2</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/WebKitLibraries/LLVMLibrariesMavericks.tar.bz2
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
</div>
</body>
</html>