<!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>[168218] 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/168218">168218</a></dd>
<dt>Author</dt> <dd>mrowe@apple.com</dd>
<dt>Date</dt> <dd>2014-05-02 18:15:47 -0700 (Fri, 02 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre><https://webkit.org/b/132505> Make it possible to tell copy-webkitlibraries-to-product-directory which OS X version to copy for
Reviewed by Dan Bernstein.
* Scripts/copy-webkitlibraries-to-product-directory: Add an --osx-version argument and use the passed value
when determining which LLVM archive to extract.</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 (168217 => 168218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-05-03 01:15:07 UTC (rev 168217)
+++ trunk/Tools/ChangeLog 2014-05-03 01:15:47 UTC (rev 168218)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-05-02 Mark Rowe <mrowe@apple.com>
+
+ <https://webkit.org/b/132505> Make it possible to tell copy-webkitlibraries-to-product-directory which OS X version to copy for
+
+ Reviewed by Dan Bernstein.
+
+ * Scripts/copy-webkitlibraries-to-product-directory: Add an --osx-version argument and use the passed value
+ when determining which LLVM archive to extract.
+
</ins><span class="cx"> 2014-05-02 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> Add Jeremy as a committer.
</span></span></pre></div>
<a id="trunkToolsScriptscopywebkitlibrariestoproductdirectory"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory (168217 => 168218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2014-05-03 01:15:07 UTC (rev 168217)
+++ trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2014-05-03 01:15:47 UTC (rev 168218)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> my $llvmSubdirectoryName = "llvm";
</span><span class="cx"> my $llvmPrefix = "/usr/local/LLVMForJavaScriptCore";
</span><span class="cx"> my $sdkName = ""; # Ideally we only use this for build commands, rather than deciding policies about what needs to get copied or built and where it needs to be placed.
</span><ins>+my $osxVersion;
</ins><span class="cx"> my $force = 0;
</span><span class="cx">
</span><span class="cx"> my $programName = basename($0);
</span><span class="lines">@@ -55,6 +56,7 @@
</span><span class="cx"> --llvm-subdirectory=<name> Set the name of the LLVM subdirectory to search for (default: $llvmSubdirectoryName)
</span><span class="cx"> --llvm-prefix=<path> Set the prefix into which LLVM is installed (default: $llvmPrefix)
</span><span class="cx"> --sdk-name=<name> Set the name of the Xcode SDK to use.
</span><ins>+ --osx-version=<version> Set the OS X version to use when deciding what to copy.
</ins><span class="cx"> --[no-]force Toggle forcing the copy - i.e. ignoring timestamps (default: $force)
</span><span class="cx"> EOF
</span><span class="cx">
</span><span class="lines">@@ -69,6 +71,7 @@
</span><span class="cx"> 'llvm-subdirectory=s' => \$llvmSubdirectoryName,
</span><span class="cx"> 'llvm-prefix=s' => \$llvmPrefix,
</span><span class="cx"> 'sdk-name=s' => \$sdkName,
</span><ins>+ 'osx-version=s' => \$osxVersion,
</ins><span class="cx"> 'force!' => \$force
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -84,6 +87,11 @@
</span><span class="cx"> $productDir = $ENV{BUILT_PRODUCTS_DIR};
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+if (!$osxVersion) {
+ $osxVersion = `sw_vers -productVersion | cut -d. -f-2`;
+ chomp($osxVersion);
+}
+
</ins><span class="cx"> chdirWebKit();
</span><span class="cx">
</span><span class="cx"> my $xcrunOptions = "";
</span><span class="lines">@@ -151,7 +159,6 @@
</span><span class="cx"> (system("mkdir", "-p", $libraryDir) == 0) or die;
</span><span class="cx">
</span><span class="cx"> # Determine where to get LLVM binaries and headers.
</span><del>- my $majorDarwinVersion = (split /\./, `uname -r`)[0];
</del><span class="cx"> my $useOwnLLVM = 0;
</span><span class="cx"> my $ownLLVMDirectory;
</span><span class="cx"> if (defined($ENV{LLVM_SOURCE_PATH})) {
</span><span class="lines">@@ -172,10 +179,10 @@
</span><span class="cx"> } elsif ($preferSystemLLVMOverDrops) {
</span><span class="cx"> # Don't fall through to drop detection.
</span><span class="cx"> print "Using system LLVM.\n";
</span><del>- } elsif ($majorDarwinVersion == 12) {
</del><ins>+ } elsif ($osxVersion eq "10.8") {
</ins><span class="cx"> $llvmLibraryPackage = "WebKitLibraries/LLVMLibrariesMountainLion.tar.bz2";
</span><span class="cx"> $llvmIncludePackage = "WebKitLibraries/LLVMIncludesMountainLion.tar.bz2";
</span><del>- } elsif ($majorDarwinVersion == 13) {
</del><ins>+ } elsif ($osxVersion eq "10.9") {
</ins><span class="cx"> $llvmLibraryPackage = "WebKitLibraries/LLVMLibrariesMavericks.tar.bz2";
</span><span class="cx"> $llvmIncludePackage = "WebKitLibraries/LLVMIncludesMavericks.tar.bz2";
</span><span class="cx"> } else {
</span></span></pre>
</div>
</div>
</body>
</html>