<!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>[168410] 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/168410">168410</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2014-05-06 22:18:07 -0700 (Tue, 06 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add Makefile targets for copying static libraries (LLVM and WKSI)
<http://webkit.org/b/132619>
Reviewed by Mark Rowe.
.:
* Makefile:
(MODULES): Add WebKitLibraries.
Tools:
* Scripts/copy-webkitlibraries-to-product-directory: Set a
sensible default for product directory if not specified on
either the command-line or in the environment (by Xcode) by
calling productDir() in webkitdirs.pm.
WebKitLibraries:
* Makefile: Added.
(libs): Install both LLVM and WKSI static libraries.
(all): Add dependency on 'libs' target.
(debug d): Set configuration, the call 'libs' target.
(release r): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkMakefile">trunk/Makefile</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptscopywebkitlibrariestoproductdirectory">trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory</a></li>
<li><a href="#trunkWebKitLibrariesChangeLog">trunk/WebKitLibraries/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkWebKitLibrariesMakefile">trunk/WebKitLibraries/Makefile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (168409 => 168410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-05-07 05:15:47 UTC (rev 168409)
+++ trunk/ChangeLog 2014-05-07 05:18:07 UTC (rev 168410)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-05-06 David Kilzer <ddkilzer@apple.com>
+
+ Add Makefile targets for copying static libraries (LLVM and WKSI)
+ <http://webkit.org/b/132619>
+
+ Reviewed by Mark Rowe.
+
+ * Makefile:
+ (MODULES): Add WebKitLibraries.
+
</ins><span class="cx"> 2014-05-06 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r168304.
</span></span></pre></div>
<a id="trunkMakefile"></a>
<div class="modfile"><h4>Modified: trunk/Makefile (168409 => 168410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Makefile 2014-05-07 05:15:47 UTC (rev 168409)
+++ trunk/Makefile 2014-05-07 05:18:07 UTC (rev 168410)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-MODULES = Source Tools
</del><ins>+MODULES = WebKitLibraries Source Tools
</ins><span class="cx">
</span><span class="cx"> all:
</span><span class="cx"> @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (168409 => 168410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-05-07 05:15:47 UTC (rev 168409)
+++ trunk/Tools/ChangeLog 2014-05-07 05:18:07 UTC (rev 168410)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-05-06 David Kilzer <ddkilzer@apple.com>
+
+ Add Makefile targets for copying static libraries (LLVM and WKSI)
+ <http://webkit.org/b/132619>
+
+ Reviewed by Mark Rowe.
+
+ * Scripts/copy-webkitlibraries-to-product-directory: Set a
+ sensible default for product directory if not specified on
+ either the command-line or in the environment (by Xcode) by
+ calling productDir() in webkitdirs.pm.
+
</ins><span class="cx"> 2014-05-06 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Add WK2 SPI to prevent the previous back/forward item from remaining in the list
</span></span></pre></div>
<a id="trunkToolsScriptscopywebkitlibrariestoproductdirectory"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory (168409 => 168410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2014-05-07 05:15:47 UTC (rev 168409)
+++ trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2014-05-07 05:18:07 UTC (rev 168410)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> if ($productDir) {
</span><span class="cx"> $productDir = File::Spec->rel2abs($productDir);
</span><span class="cx"> } else {
</span><del>- $productDir = $ENV{BUILT_PRODUCTS_DIR};
</del><ins>+ $productDir = $ENV{BUILT_PRODUCTS_DIR} || productDir();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!$osxVersion) {
</span></span></pre></div>
<a id="trunkWebKitLibrariesChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/ChangeLog (168409 => 168410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/ChangeLog 2014-05-07 05:15:47 UTC (rev 168409)
+++ trunk/WebKitLibraries/ChangeLog 2014-05-07 05:18:07 UTC (rev 168410)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-05-06 David Kilzer <ddkilzer@apple.com>
+
+ Add Makefile targets for copying static libraries (LLVM and WKSI)
+ <http://webkit.org/b/132619>
+
+ Reviewed by Mark Rowe.
+
+ * Makefile: Added.
+ (libs): Install both LLVM and WKSI static libraries.
+ (all): Add dependency on 'libs' target.
+ (debug d): Set configuration, the call 'libs' target.
+ (release r): Ditto.
+
</ins><span class="cx"> 2014-05-05 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=132593
</span></span></pre></div>
<a id="trunkWebKitLibrariesMakefile"></a>
<div class="addfile"><h4>Added: trunk/WebKitLibraries/Makefile (0 => 168410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/Makefile (rev 0)
+++ trunk/WebKitLibraries/Makefile 2014-05-07 05:18:07 UTC (rev 168410)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+SCRIPTS_PATH = ../Tools/Scripts
+
+libs:
+ perl $(SCRIPTS_PATH)/copy-webkitlibraries-to-product-directory --wksi --llvm
+
+all: libs
+
+debug d:
+ $(SCRIPTS_PATH)/set-webkit-configuration --debug
+ @$(MAKE) libs
+
+release r:
+ $(SCRIPTS_PATH)/set-webkit-configuration --release
+ @$(MAKE) libs
+
</ins></span></pre>
</div>
</div>
</body>
</html>