<!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>[182138] trunk/Source/WebKit2</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/182138">182138</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-30 06:17:55 -0700 (Mon, 30 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL][GTK] WebKit2's generate-forwarding-headers.pl should fail if clashing headers found
https://bugs.webkit.org/show_bug.cgi?id=142909
Reviewed by Philippe Normand.
* Scripts/generate-forwarding-headers.pl:
(createForwardingHeadersForFramework):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2Scriptsgenerateforwardingheaderspl">trunk/Source/WebKit2/Scripts/generate-forwarding-headers.pl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182137 => 182138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-30 12:41:02 UTC (rev 182137)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-30 13:17:55 UTC (rev 182138)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-03-30 Csaba Osztrogonác <ossy@webkit.org>
+
+ [EFL][GTK] WebKit2's generate-forwarding-headers.pl should fail if clashing headers found
+ https://bugs.webkit.org/show_bug.cgi?id=142909
+
+ Reviewed by Philippe Normand.
+
+ * Scripts/generate-forwarding-headers.pl:
+ (createForwardingHeadersForFramework):
+
</ins><span class="cx"> 2015-03-29 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Include cache entry worth to json dump
</span></span></pre></div>
<a id="trunkSourceWebKit2Scriptsgenerateforwardingheaderspl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/generate-forwarding-headers.pl (182137 => 182138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Scripts/generate-forwarding-headers.pl 2015-03-30 12:41:02 UTC (rev 182137)
+++ trunk/Source/WebKit2/Scripts/generate-forwarding-headers.pl 2015-03-30 13:17:55 UTC (rev 182138)
</span><span class="lines">@@ -93,23 +93,28 @@
</span><span class="cx"> foreach my $header (@frameworkHeaders) {
</span><span class="cx"> my $headerName = basename($header);
</span><span class="cx">
</span><del>- # If we found more headers with the same name, only generate a forwarding header for the current platform
- if(grep($_ =~ "/$headerName\$", @frameworkHeaders) == 1 || $header =~ "/$platform/" ) {
- my $forwardingHeaderPath = File::Spec->catfile($targetDirectory, $headerName);
- my $expectedIncludeStatement = "#include \"$frameworkDirectoryName/$header\"";
- my $foundIncludeStatement = 0;
</del><ins>+ # If we found more headers with the same name, exit immediately.
+ my @headers = grep($_ =~ "/$headerName\$", @frameworkHeaders);
+ if (@headers != 1) {
+ print("ERROR: Can't create $headerName forwarding header, because there are more headers with the same name:\n");
+ foreach (@headers) { print " - $_\n" };
+ die();
+ }
</ins><span class="cx">
</span><del>- $foundIncludeStatement = <EXISTING_HEADER> if open(EXISTING_HEADER, "<$forwardingHeaderPath");
- chomp($foundIncludeStatement);
</del><ins>+ my $forwardingHeaderPath = File::Spec->catfile($targetDirectory, $headerName);
+ my $expectedIncludeStatement = "#include \"$frameworkDirectoryName/$header\"";
+ my $foundIncludeStatement = 0;
</ins><span class="cx">
</span><del>- if (! $foundIncludeStatement || $foundIncludeStatement ne $expectedIncludeStatement) {
- print "[Creating forwarding header for $framework/$header]\n" if $verbose;
- open(FORWARDING_HEADER, ">$forwardingHeaderPath") or die "Could not open $forwardingHeaderPath.";
- print FORWARDING_HEADER "$expectedIncludeStatement\n";
- close(FORWARDING_HEADER);
- }
</del><ins>+ $foundIncludeStatement = <EXISTING_HEADER> if open(EXISTING_HEADER, "<$forwardingHeaderPath");
+ chomp($foundIncludeStatement);
</ins><span class="cx">
</span><del>- close(EXISTING_HEADER);
</del><ins>+ if (! $foundIncludeStatement || $foundIncludeStatement ne $expectedIncludeStatement) {
+ print "[Creating forwarding header for $framework/$header]\n";
+ open(FORWARDING_HEADER, ">$forwardingHeaderPath") or die "Could not open $forwardingHeaderPath.";
+ print FORWARDING_HEADER "$expectedIncludeStatement\n";
+ close(FORWARDING_HEADER);
</ins><span class="cx"> }
</span><ins>+
+ close(EXISTING_HEADER);
</ins><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>