[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[ossy at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 5b4b61c3d894f03379a3f62c426d357206330108
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 27 18:26:46 2010 +0000

    2010-09-27  Andras Becsi  <abecsi at webkit.org>
    
            Reviewed by Csaba Osztrogonác.
    
            [Qt] Make generate-forwarding-headers.pl aware of moved headers
            https://bugs.webkit.org/show_bug.cgi?id=46621
    
            * generate-forwarding-headers.pl:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68409 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index fd9c6c7..29a6301 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-27  Andras Becsi  <abecsi at webkit.org>
+
+        Reviewed by Csaba Osztrogonác.
+
+        [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  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Anders Carlsson.
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);
     }
 }
 

-- 
WebKit Debian packaging