<!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>[171693] 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/171693">171693</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2014-07-28 13:48:50 -0700 (Mon, 28 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support for running the Clang static analyzer when building WebKit and JSC
https://bugs.webkit.org/show_bug.cgi?id=134955
Reviewed by Brent Fulgham.
* Scripts/build-jsc: Added command line options -[no]-analyze (disabled by default).
* Scripts/build-webkit: Add --analyze command line option to build-webkit to enable
running the Clang static analyzer.
* Scripts/webkitdirs.pm:
(XcodeStaticAnalyzerOption): Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsbuildjsc">trunk/Tools/Scripts/build-jsc</a></li>
<li><a href="#trunkToolsScriptsbuildwebkit">trunk/Tools/Scripts/build-webkit</a></li>
<li><a href="#trunkToolsScriptswebkitdirspm">trunk/Tools/Scripts/webkitdirs.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (171692 => 171693)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-07-28 20:44:50 UTC (rev 171692)
+++ trunk/Tools/ChangeLog 2014-07-28 20:48:50 UTC (rev 171693)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-07-28 Daniel Bates <dabates@apple.com>
+
+ Add support for running the Clang static analyzer when building WebKit and JSC
+ https://bugs.webkit.org/show_bug.cgi?id=134955
+
+ Reviewed by Brent Fulgham.
+
+ * Scripts/build-jsc: Added command line options -[no]-analyze (disabled by default).
+ * Scripts/build-webkit: Add --analyze command line option to build-webkit to enable
+ running the Clang static analyzer.
+ * Scripts/webkitdirs.pm:
+ (XcodeStaticAnalyzerOption): Added.
+
</ins><span class="cx"> 2014-07-24 David Farler <dfarler@apple.com>
</span><span class="cx">
</span><span class="cx"> Allow for multiple DumpRenderTree and WebKitTestRunner instances in the iOS Simulator
</span></span></pre></div>
<a id="trunkToolsScriptsbuildjsc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-jsc (171692 => 171693)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-jsc 2014-07-28 20:44:50 UTC (rev 171692)
+++ trunk/Tools/Scripts/build-jsc 2014-07-28 20:48:50 UTC (rev 171693)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx">
</span><span class="cx"> sub writeCongrats();
</span><span class="cx">
</span><ins>+my $shouldRunStaticAnalyzer = 0;
</ins><span class="cx"> my $coverageSupport = 0;
</span><span class="cx"> my $showHelp = 0;
</span><span class="cx"> my $ftlJIT = isAppleWebKit();
</span><span class="lines">@@ -54,6 +55,7 @@
</span><span class="cx"> my $usage = <<EOF;
</span><span class="cx"> Usage: $programName [options] [options to pass to build system]
</span><span class="cx"> --help Show this help message
</span><ins>+ --[no-]analyze Toggle code static analysis (default: $shouldRunStaticAnalyzer)
</ins><span class="cx"> --[no-]coverage Toggle code coverage support (default: $coverageSupport)
</span><span class="cx"> --[no-]ftl-jit Toggle FTL JIT support (default: $ftlJIT)
</span><span class="cx"> --[no-]copy-libraries Toggle whether to copy libraries (default: $copyLibraries)
</span><span class="lines">@@ -64,6 +66,7 @@
</span><span class="cx"> EOF
</span><span class="cx">
</span><span class="cx"> GetOptions(
</span><ins>+ 'analyze!' => \$shouldRunStaticAnalyzer,
</ins><span class="cx"> 'coverage!' => \$coverageSupport,
</span><span class="cx"> 'help' => \$showHelp,
</span><span class="cx"> 'ftl-jit!' => \$ftlJIT,
</span><span class="lines">@@ -83,7 +86,9 @@
</span><span class="cx"> setConfiguration();
</span><span class="cx"> chdirWebKit();
</span><span class="cx"> my @options = XcodeOptions();
</span><del>-my @coverageSupportOptions = ($coverageSupport) ? XcodeCoverageSupportOptions() : ();
</del><ins>+my @additionalSupportOptions = ();
+push @additionalSupportOptions, XcodeCoverageSupportOptions() if $coverageSupport;
+push @additionalSupportOptions, XcodeStaticAnalyzerOption() if $shouldRunStaticAnalyzer;
</ins><span class="cx">
</span><span class="cx"> if (cmakeBasedPortName()) {
</span><span class="cx"> $cmakeArgs .= " -DENABLE_LLINT_C_LOOP=ON" if $forceCLoop;
</span><span class="lines">@@ -120,7 +125,7 @@
</span><span class="cx"> my $result;
</span><span class="cx"> chdir $projectDirectory or die "Can't find $projectName directory to build from";
</span><span class="cx"> if (isAppleMacWebKit()) {
</span><del>- $result = system "sh", "-c", ('xcodebuild -project ' . $projectName . '.xcodeproj "$@" | grep -v setenv && exit ${PIPESTATUS[0]}'), "xcodebuild", @options, @ARGV, @coverageSupportOptions;
</del><ins>+ $result = system "sh", "-c", ('xcodebuild -project ' . $projectName . '.xcodeproj "$@" | grep -v setenv && exit ${PIPESTATUS[0]}'), "xcodebuild", @options, @ARGV, @additionalSupportOptions;
</ins><span class="cx"> } elsif (isAppleWinWebKit() || isWinCairo()) {
</span><span class="cx"> # WTF is a part of JavaScriptCore.sln because jsc.exe wouldn't start otherwise.
</span><span class="cx"> if ($projectName ne "WTF") {
</span></span></pre></div>
<a id="trunkToolsScriptsbuildwebkit"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-webkit (171692 => 171693)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-webkit 2014-07-28 20:44:50 UTC (rev 171692)
+++ trunk/Tools/Scripts/build-webkit 2014-07-28 20:48:50 UTC (rev 171693)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> my $noWebKit1 = 0;
</span><span class="cx"> my $noWebKit2 = 0;
</span><span class="cx"> my $coverageSupport = 0;
</span><ins>+my $shouldRunStaticAnalyzer = 0;
</ins><span class="cx"> my $startTime = time();
</span><span class="cx">
</span><span class="cx"> my @features = getFeatureOptionList();
</span><span class="lines">@@ -91,7 +92,8 @@
</span><span class="cx"> --sdk=<sdk> Use a specific Xcode SDK (iOS and Mac only)
</span><span class="cx"> --device Use the current iphoneos.internal SDK (iOS only)
</span><span class="cx"> --simulator Use the current iphonesimulator SDK (iOS only)
</span><del>- --coverage Enable Code Coverage support (Mac only)
</del><ins>+ --coverage Enable code coverage support (Mac only)
+ --analyze Enable static anaylsis (iOS and Mac only)
</ins><span class="cx">
</span><span class="cx"> --efl Build the EFL port
</span><span class="cx"> --gtk Build the GTK+ port
</span><span class="lines">@@ -125,6 +127,7 @@
</span><span class="cx"> 'no-webkit1' => \$noWebKit1,
</span><span class="cx"> 'no-webkit2' => \$noWebKit2,
</span><span class="cx"> 'coverage' => \$coverageSupport,
</span><ins>+ 'analyze' => \$shouldRunStaticAnalyzer,
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> # Build usage text and options list from features
</span><span class="lines">@@ -284,6 +287,7 @@
</span><span class="cx"> if (isAppleMacWebKit()) {
</span><span class="cx"> my @local_options = @options;
</span><span class="cx"> push @local_options, XcodeCoverageSupportOptions() if $coverageSupport;
</span><ins>+ push @local_options, XcodeStaticAnalyzerOption() if $shouldRunStaticAnalyzer;
</ins><span class="cx"> my $projectPath = $project =~ /gtest/ ? "xcode/gtest" : $project;
</span><span class="cx"> if (isIOSWebKit()){
</span><span class="cx"> push @local_options, qw(-target WebKitTestRunnerApp) if ($project eq "WebKitTestRunner") && !$clean;
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (171692 => 171693)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2014-07-28 20:44:50 UTC (rev 171692)
+++ trunk/Tools/Scripts/webkitdirs.pm 2014-07-28 20:48:50 UTC (rev 171693)
</span><span class="lines">@@ -49,9 +49,11 @@
</span><span class="cx"> $VERSION = 1.00;
</span><span class="cx"> @ISA = qw(Exporter);
</span><span class="cx"> @EXPORT = qw(
</span><ins>+ &XcodeCoverageSupportOptions
</ins><span class="cx"> &XcodeOptionString
</span><span class="cx"> &XcodeOptionStringNoConfig
</span><span class="cx"> &XcodeOptions
</span><ins>+ &XcodeStaticAnalyzerOption
</ins><span class="cx"> &appDisplayNameFromBundle
</span><span class="cx"> &baseProductDir
</span><span class="cx"> &chdirWebKit
</span><span class="lines">@@ -643,6 +645,11 @@
</span><span class="cx"> return @coverageSupportOptions;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub XcodeStaticAnalyzerOption()
+{
+ return "RUN_CLANG_STATIC_ANALYZER=YES";
+}
+
</ins><span class="cx"> my $passedConfiguration;
</span><span class="cx"> my $searchedForPassedConfiguration;
</span><span class="cx"> sub determinePassedConfiguration
</span></span></pre>
</div>
</div>
</body>
</html>