<!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>[168525] 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/168525">168525</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-09 05:49:26 -0700 (Fri, 09 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Make generate-forwarding-headers.pl work after WebKit2.framework -> WebKit.framework rename
https://bugs.webkit.org/show_bug.cgi?id=132733
Patch by Martin Hodovan <mhodovan.u-szeged@partner.samsung.com> on 2014-05-09
Reviewed by Csaba Osztrogonác.
Rewrite framework's directory name to WebKit2 if the framework is WebKit (former WebKit2)
and then collect headers inside the fixed framework directory and generate forwarding
headers point to the fixed directory.
Leave WebKit2 in @frameworks list during the transition. It can be removed
once <WebKit2/foo.h> style includes were renamed to <WebKit/foo.h> everywhere.
* Scripts/generate-forwarding-headers.pl:
(collectFameworkHeaderPaths):
(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 (168524 => 168525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-09 10:58:14 UTC (rev 168524)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-09 12:49:26 UTC (rev 168525)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-05-09 Martin Hodovan <mhodovan.u-szeged@partner.samsung.com>
+
+ [WK2] Make generate-forwarding-headers.pl work after WebKit2.framework -> WebKit.framework rename
+ https://bugs.webkit.org/show_bug.cgi?id=132733
+
+ Reviewed by Csaba Osztrogonác.
+
+ Rewrite framework's directory name to WebKit2 if the framework is WebKit (former WebKit2)
+ and then collect headers inside the fixed framework directory and generate forwarding
+ headers point to the fixed directory.
+
+ Leave WebKit2 in @frameworks list during the transition. It can be removed
+ once <WebKit2/foo.h> style includes were renamed to <WebKit/foo.h> everywhere.
+
+ * Scripts/generate-forwarding-headers.pl:
+ (collectFameworkHeaderPaths):
+ (createForwardingHeadersForFramework):
+
</ins><span class="cx"> 2014-05-08 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Automatically zip document bundles used via File API
</span></span></pre></div>
<a id="trunkSourceWebKit2Scriptsgenerateforwardingheaderspl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/generate-forwarding-headers.pl (168524 => 168525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Scripts/generate-forwarding-headers.pl 2014-05-09 10:58:14 UTC (rev 168524)
+++ trunk/Source/WebKit2/Scripts/generate-forwarding-headers.pl 2014-05-09 12:49:26 UTC (rev 168525)
</span><span class="lines">@@ -36,10 +36,11 @@
</span><span class="cx"> my $srcRoot = realpath(File::Spec->catfile(dirname(abs_path($0)), "../.."));
</span><span class="cx"> my $incFromRoot = abs_path($ARGV[0]);
</span><span class="cx"> my @platformPrefixes = ("cf", "Cocoa", "CoordinatedGraphics", "curl", "efl", "gtk", "mac", "soup", "win");
</span><del>-my @frameworks = ("JavaScriptCore", "WebCore", "WebKit2");
</del><ins>+my @frameworks = ("JavaScriptCore", "WebCore", "WebKit", "WebKit2");
</ins><span class="cx"> my @skippedPrefixes;
</span><span class="cx"> my @frameworkHeaders;
</span><span class="cx"> my $framework;
</span><ins>+my $frameworkDirectoryName;
</ins><span class="cx"> my %neededHeaders;
</span><span class="cx">
</span><span class="cx"> shift;
</span><span class="lines">@@ -53,11 +54,12 @@
</span><span class="cx">
</span><span class="cx"> foreach (@frameworks) {
</span><span class="cx"> $framework = $_;
</span><ins>+ $frameworkDirectoryName = ($framework eq "WebKit") ? "WebKit2" : $framework;
</ins><span class="cx"> @frameworkHeaders = ();
</span><span class="cx"> %neededHeaders = ();
</span><span class="cx">
</span><span class="cx"> find(\&collectNeededHeaders, $incFromRoot);
</span><del>- find(\&collectFameworkHeaderPaths, File::Spec->catfile($srcRoot, $framework));
</del><ins>+ find(\&collectFameworkHeaderPaths, File::Spec->catfile($srcRoot, $frameworkDirectoryName));
</ins><span class="cx"> createForwardingHeadersForFramework();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -79,7 +81,7 @@
</span><span class="cx"> my $filePath = $File::Find::name;
</span><span class="cx"> my $file = $_;
</span><span class="cx"> if ($filePath =~ '\.h$' && $filePath !~ "ForwardingHeaders" && grep{$file eq $_} keys %neededHeaders) {
</span><del>- my $headerPath = substr($filePath, length(File::Spec->catfile($srcRoot, $framework)) + 1 );
</del><ins>+ my $headerPath = substr($filePath, length(File::Spec->catfile($srcRoot, $frameworkDirectoryName)) + 1 );
</ins><span class="cx"> push(@frameworkHeaders, $headerPath) unless (grep($headerPath =~ "$_/", @skippedPrefixes) || $headerPath =~ "config.h");
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -93,7 +95,7 @@
</span><span class="cx"> # If we found more headers with the same name, only generate a forwarding header for the current platform
</span><span class="cx"> if(grep($_ =~ "/$headerName\$", @frameworkHeaders) == 1 || $header =~ "/$platform/" ) {
</span><span class="cx"> my $forwardingHeaderPath = File::Spec->catfile($targetDirectory, $headerName);
</span><del>- my $expectedIncludeStatement = "#include \"$framework/$header\"";
</del><ins>+ my $expectedIncludeStatement = "#include \"$frameworkDirectoryName/$header\"";
</ins><span class="cx"> my $foundIncludeStatement = 0;
</span><span class="cx">
</span><span class="cx"> $foundIncludeStatement = <EXISTING_HEADER> if open(EXISTING_HEADER, "<$forwardingHeaderPath");
</span></span></pre>
</div>
</div>
</body>
</html>