Attachment 68907 Details for Bug 46621 – proposed patch

[patch] proposed patch

patch.diff (text/plain), 1.94 KB, created by Andras Becsi on 2010-09-27 07:28:43 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andras Becsi

Created: 2010-09-27 07:28:43 PDT

Size: 1.94 KB

patch

obsolete

>diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
>index acabefc..2f07f51 100644
>--- a/WebKit2/ChangeLog
>+++ b/WebKit2/ChangeLog
>@@ -1,3 +1,12 @@
>+2010-09-27  Andras Becsi  <abecsi@webkit.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        [Qt] Make generate-forwarding-headers.pl aware of moved headers
>+        https://bugs.webkit.org/show_bug.cgi?id=46621
>+
>+        * generate-forwarding-headers.pl:
>+
> 2010-09-27  Adam Roben  <aroben@apple.com>
> 
>         Don't double-free CERT_CONTEXTs when copying PlatformCertificateInfos
>diff --git a/WebKit2/generate-forwarding-headers.pl b/WebKit2/generate-forwarding-headers.pl
>index 6a779c2..e836fa4 100755
>--- a/WebKit2/generate-forwarding-headers.pl
>+++ b/WebKit2/generate-forwarding-headers.pl
>@@ -81,12 +81,17 @@ sub collectFameworkHeaderPaths {
> sub createForwardingHeadersForFramework {
>     foreach my $header (@frameworkHeaders) {
>         my $forwardingHeaderPath = File::Spec->catfile($outputDirectory, $framework, basename($header));
>-        if (! -e $forwardingHeaderPath) {
>-            print "[Create forwarding header for $framework/$header]\n";
>-            open(FORWARDING_HEADER, ">$forwardingHeaderPath") or die "Could not open $forwardingHeaderPath.\n";
>-            print FORWARDING_HEADER "#include \"$header\"\n";
>+        my $expectedIncludeStatement = "#include \"$header\"";
>+        my $foundIncludeStatement = 0;
>+        $foundIncludeStatement = <EXISTING_HEADER> if open(EXISTING_HEADER, "<$forwardingHeaderPath");
>+        chomp($foundIncludeStatement);
>+        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);
>         }
>+        close(EXISTING_HEADER);
>     }
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 46621: 68907