<!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>[203742] 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/203742">203742</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2016-07-26 15:04:02 -0700 (Tue, 26 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>check-for-exit-time-destructors should be usable outside Xcode
<https://webkit.org/b/160195>
Reviewed by Darin Adler.
* Scripts/check-for-exit-time-destructors: Update to parse
-h|--help switch, or to take one argument to a binary to check
for exit time destructors on the command-line. The clang
compiler will find these at compile-time with the
-Wexit-time-destructors switch, but this script will check for
them after-the-fact.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptscheckforexittimedestructors">trunk/Tools/Scripts/check-for-exit-time-destructors</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (203741 => 203742)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2016-07-26 22:03:01 UTC (rev 203741)
+++ trunk/Tools/ChangeLog        2016-07-26 22:04:02 UTC (rev 203742)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-07-26 David Kilzer <ddkilzer@apple.com>
+
+ check-for-exit-time-destructors should be usable outside Xcode
+ <https://webkit.org/b/160195>
+
+ Reviewed by Darin Adler.
+
+ * Scripts/check-for-exit-time-destructors: Update to parse
+ -h|--help switch, or to take one argument to a binary to check
+ for exit time destructors on the command-line. The clang
+ compiler will find these at compile-time with the
+ -Wexit-time-destructors switch, but this script will check for
+ them after-the-fact.
+
</ins><span class="cx"> 2016-07-26 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Test svn.webkit.org functionality after maintenance.
</span></span></pre></div>
<a id="trunkToolsScriptscheckforexittimedestructors"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/check-for-exit-time-destructors (203741 => 203742)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/check-for-exit-time-destructors        2016-07-26 22:03:01 UTC (rev 203741)
+++ trunk/Tools/Scripts/check-for-exit-time-destructors        2016-07-26 22:04:02 UTC (rev 203742)
</span><span class="lines">@@ -1,30 +1,26 @@
</span><span class="cx"> #!/usr/bin/perl
</span><span class="cx">
</span><del>-# Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
</del><ins>+# Copyright (C) 2006-2008, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> #
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="cx"> # modification, are permitted provided that the following conditions
</span><span class="cx"> # are met:
</span><del>-#
</del><span class="cx"> # 1. Redistributions of source code must retain the above copyright
</span><del>-# notice, this list of conditions and the following disclaimer.
</del><ins>+# notice, this list of conditions and the following disclaimer.
</ins><span class="cx"> # 2. Redistributions in binary form must reproduce the above copyright
</span><span class="cx"> # notice, this list of conditions and the following disclaimer in the
</span><del>-# documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Inc. ("Apple") nor the names of
-# its contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
</del><ins>+# documentation and/or other materials provided with the distribution.
</ins><span class="cx"> #
</span><del>-# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
</del><ins>+# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
</ins><span class="cx"> # EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
</span><span class="cx"> # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
</span><del>-# DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
</del><ins>+# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
</ins><span class="cx"> # DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
</span><span class="cx"> # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
</span><del>-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</del><ins>+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</ins><span class="cx">
</span><span class="cx"> # "check-for-exit-time-destructors" script for WebKit Open Source Project
</span><span class="cx">
</span><span class="lines">@@ -35,33 +31,54 @@
</span><span class="cx"> use strict;
</span><span class="cx">
</span><span class="cx"> use File::Basename;
</span><ins>+use File::Spec;
+use Getopt::Long;
</ins><span class="cx">
</span><span class="cx"> sub touch($);
</span><span class="cx"> sub printFunctions($$);
</span><span class="cx">
</span><del>-my $arch = $ENV{'CURRENT_ARCH'};
-my $configuration = $ENV{'CONFIGURATION'};
-my $target = $ENV{'TARGET_NAME'};
-my $variant = $ENV{'CURRENT_VARIANT'};
-my $coverageBuild = $ENV{'WEBKIT_COVERAGE_BUILD'};
-my $debugRoot = $ENV{'WEBKIT_DEBUG_ROOT'};
</del><ins>+my $coverageBuild;
+my $executablePath;
+my @files;
+my $showHelp;
+my $tempDir;
</ins><span class="cx">
</span><del>-my $executablePath = "$ENV{'TARGET_BUILD_DIR'}/$ENV{'EXECUTABLE_PATH'}";
</del><ins>+if (@ARGV) {
+ # Running in interactive mode with arguments.
+ my $result = GetOptions(
+ "h|help" => \$showHelp,
+ );
+ $executablePath = glob(shift @ARGV);
</ins><span class="cx">
</span><del>-my $buildTimestampPath = $ENV{'TARGET_TEMP_DIR'} . "/" . basename($0) . ".timestamp";
-my $buildTimestampAge = -M $buildTimestampPath;
-my $scriptAge = -M $0;
</del><ins>+ if (!$result || $showHelp || @ARGV > 0) {
+ print STDERR "Check for exit-time destructors.\n";
+ print STDERR "Usage: " . basename($0) . " [options] path/to/executable\n";
+ print STDERR <<END;
+ [-h|--help] show this help message
+END
+ exit 1;
+ }
</ins><span class="cx">
</span><del>-my $list = $ENV{"LINK_FILE_LIST_${variant}_${arch}"};
</del><ins>+ $tempDir = File::Spec->tmpdir();
+ @files = ($executablePath);
+} else {
+ # Running from Xcode build phase script with no arguments.
+ $coverageBuild = $ENV{'WEBKIT_COVERAGE_BUILD'};
+ $executablePath = "$ENV{'TARGET_BUILD_DIR'}/$ENV{'EXECUTABLE_PATH'}";
+ $tempDir = $ENV{'TARGET_TEMP_DIR'};
</ins><span class="cx">
</span><del>-if (!open LIST, $list) {
- print "ERROR: Could not open $list\n";
- exit 1;
</del><ins>+ my $arch = $ENV{'CURRENT_ARCH'};
+ my $variant = $ENV{'CURRENT_VARIANT'};
+ my $list = $ENV{"LINK_FILE_LIST_${variant}_${arch}"};
+ open LIST, $list || die "ERROR: Could not open $list\n";
+ @files = <LIST>;
+ chomp @files;
+ close LIST;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-my @files = <LIST>;
-chomp @files;
-close LIST;
</del><ins>+my $buildTimestampPath = File::Spec->catfile($tempDir, basename($0) . ".timestamp");
+my $buildTimestampAge = -M $buildTimestampPath;
+my $scriptAge = -M $0;
</ins><span class="cx">
</span><span class="cx"> my $sawError = 0;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>