<!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>[163935] 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/163935">163935</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-02-11 20:06:42 -0800 (Tue, 11 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>It should be possible to force copy-webkitlibraries-blahblah to copy things regardless of timestamp
https://bugs.webkit.org/show_bug.cgi?id=128646
Reviewed by Mark Rowe.
* Scripts/copy-webkitlibraries-to-product-directory:
(unpackIfNecessary):
(dittoHeaders):</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 (163934 => 163935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-02-12 03:53:02 UTC (rev 163934)
+++ trunk/Tools/ChangeLog 2014-02-12 04:06:42 UTC (rev 163935)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-02-11 Filip Pizlo <fpizlo@apple.com>
+
+ It should be possible to force copy-webkitlibraries-blahblah to copy things regardless of timestamp
+ https://bugs.webkit.org/show_bug.cgi?id=128646
+
+ Reviewed by Mark Rowe.
+
+ * Scripts/copy-webkitlibraries-to-product-directory:
+ (unpackIfNecessary):
+ (dittoHeaders):
+
</ins><span class="cx"> 2014-02-11 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Replay: upstream replay input code generator and EncodedValue class
</span></span></pre></div>
<a id="trunkToolsScriptscopywebkitlibrariestoproductdirectory"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory (163934 => 163935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2014-02-12 03:53:02 UTC (rev 163934)
+++ trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2014-02-12 04:06:42 UTC (rev 163935)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> my $llvmIncludePackage = "";
</span><span class="cx"> my $llvmLibraryPackage = "";
</span><span class="cx"> my $useFullLibPaths = 0;
</span><ins>+my $force = 0;
</ins><span class="cx">
</span><span class="cx"> my $programName = basename($0);
</span><span class="cx"> my $usage = <<EOF;
</span><span class="lines">@@ -46,6 +47,7 @@
</span><span class="cx"> --use-llvm-includes=<path> Get the LLVM inludes package from <path>
</span><span class="cx"> --use-llvm-libraries=<path> Get the LLVM libraries package from <path>
</span><span class="cx"> --[no-]use-full-lib-paths Toggle using full library paths
</span><ins>+ --[no-]force Toggle forcing the copy - i.e. ignoring timestamps (default: $force)
</ins><span class="cx"> EOF
</span><span class="cx">
</span><span class="cx"> GetOptions(
</span><span class="lines">@@ -54,7 +56,8 @@
</span><span class="cx"> 'wksi!' => \$wksi,
</span><span class="cx"> 'use-llvm-includes=s' => \$llvmIncludePackage,
</span><span class="cx"> 'use-llvm-libraries=s' => \$llvmLibraryPackage,
</span><del>- 'use-full-lib-paths!' => \$useFullLibPaths
</del><ins>+ 'use-full-lib-paths!' => \$useFullLibPaths,
+ 'force!' => \$force
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ($showHelp) {
</span><span class="lines">@@ -77,7 +80,7 @@
</span><span class="cx"> sub unpackIfNecessary
</span><span class="cx"> {
</span><span class="cx"> my ($targetDir, $sampleFile, $package, $hasLibraries) = @_;
</span><del>- if (!-e $sampleFile || -M $sampleFile > -M $package) {
</del><ins>+ if ($force || !-e $sampleFile || -M $sampleFile > -M $package) {
</ins><span class="cx"> print "Unpacking $package into $targetDir\n";
</span><span class="cx"> (system("tar -C $targetDir -xmf $package") == 0) or die;
</span><span class="cx"> if ($hasLibraries) {
</span><span class="lines">@@ -95,7 +98,7 @@
</span><span class="cx"> sub dittoHeaders
</span><span class="cx"> {
</span><span class="cx"> my ($srcHeader, $header) = @_;
</span><del>- if (!-e $header || -M $header > -M $srcHeader) {
</del><ins>+ if ($force || !-e $header || -M $header > -M $srcHeader) {
</ins><span class="cx"> print "Updating $header\n";
</span><span class="cx"> (system("ditto", $srcHeader, $header) == 0) or die;
</span><span class="cx"> }
</span><span class="lines">@@ -116,7 +119,7 @@
</span><span class="cx"> foreach my $libName (@librariesToCopy) {
</span><span class="cx"> my $srcLib = "WebKitLibraries/" . $libName;
</span><span class="cx"> my $lib = "$libraryDir/" . $libName;
</span><del>- if (!-e $lib || -M $lib > -M $srcLib) {
</del><ins>+ if ($force || !-e $lib || -M $lib > -M $srcLib) {
</ins><span class="cx"> print "Updating $lib\n";
</span><span class="cx"> (system("ditto", $srcLib, $lib) == 0) or die;
</span><span class="cx"> (system($ranlib, $lib) == 0) or die;
</span><span class="lines">@@ -226,7 +229,8 @@
</span><span class="cx"> my $ranlibToken = "$libraryTargetDirectory/.ranlibToken-$filename";
</span><span class="cx"> unlink($targetLibrary);
</span><span class="cx"> symlink($sourceLibrary, $targetLibrary);
</span><del>- if (!-e $ranlibToken
</del><ins>+ if ($force
+ || !-e $ranlibToken
</ins><span class="cx"> || !fileContentsEquals($ranlibToken, $sourceLibrary)
</span><span class="cx"> || -M $ranlibToken > -M $sourceLibrary) {
</span><span class="cx"> print " Ranlib $filename\n";
</span></span></pre>
</div>
</div>
</body>
</html>