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

[laszlo.1.gombos at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 357d168d31bf807a1715e7cacfdbdcfbbfd5990b
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Nov 28 18:32:26 2010 +0000

    2010-11-28  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Move some build logic from Qt to platform independent code
            https://bugs.webkit.org/show_bug.cgi?id=50134
    
            Remove the creation of the directories under $$OUTPUT_DIR/include
            as these will be handled by the fwheader_generator target.
    
            Remove the explicit generation of $$OUTPUT_DIR/WebKit2/generated as
            this is not required.
    
            * DerivedSources.pro:
    2010-11-28  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Move some build logic from Qt to platform independent code
            https://bugs.webkit.org/show_bug.cgi?id=50134
    
            Create target directories inside generate-forwarding-headers.pl.
    
            * Scripts/generate-forwarding-headers.pl:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72779 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index ef4c92a..c203d18 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,18 @@
+2010-11-28  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Move some build logic from Qt to platform independent code
+        https://bugs.webkit.org/show_bug.cgi?id=50134
+
+        Remove the creation of the directories under $$OUTPUT_DIR/include
+        as these will be handled by the fwheader_generator target.
+
+        Remove the explicit generation of $$OUTPUT_DIR/WebKit2/generated as
+        this is not required.
+
+        * DerivedSources.pro:
+
 2010-11-24  Brady Eidson  <beidson at apple.com>
 
         Reviewed implicitly by John Sullivan.
diff --git a/WebKit2/DerivedSources.pro b/WebKit2/DerivedSources.pro
index fa646e4..2b6a09d 100644
--- a/WebKit2/DerivedSources.pro
+++ b/WebKit2/DerivedSources.pro
@@ -36,10 +36,6 @@ SBOX_CHECK = $$(_SBOX_DIR)
 
 
 DIRS = \
-    $$OUTPUT_DIR/include/JavaScriptCore \
-    $$OUTPUT_DIR/include/WebCore \
-    $$OUTPUT_DIR/include/WebKit2 \
-    $$OUTPUT_DIR/WebKit2/generated \
     $$OUTPUT_DIR/WebKitTools/MiniBrowser/qt
 
 for(DIR, DIRS) {
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 55cedae..e4828ae 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-28  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Move some build logic from Qt to platform independent code
+        https://bugs.webkit.org/show_bug.cgi?id=50134
+
+        Create target directories inside generate-forwarding-headers.pl.
+
+        * Scripts/generate-forwarding-headers.pl:
+
 2010-11-24  Nicolas Dufresne  <nicolas.dufresne at collabora.co.uk>
 
         Reviewed by Martin Robinson.
diff --git a/WebKitTools/Scripts/generate-forwarding-headers.pl b/WebKitTools/Scripts/generate-forwarding-headers.pl
index ed58702..d5abb5b 100755
--- a/WebKitTools/Scripts/generate-forwarding-headers.pl
+++ b/WebKitTools/Scripts/generate-forwarding-headers.pl
@@ -30,6 +30,7 @@ use strict;
 use Cwd qw(abs_path realpath);
 use File::Find;
 use File::Basename;
+use File::Path qw(mkpath);
 use File::Spec::Functions;
 
 my $srcRoot = realpath(File::Spec->catfile(dirname(abs_path($0)), "../.."));
@@ -81,8 +82,10 @@ sub collectFameworkHeaderPaths {
 }
 
 sub createForwardingHeadersForFramework {
+    my $targetDirectory = File::Spec->catfile($outputDirectory, $framework);
+    mkpath($targetDirectory);
     foreach my $header (@frameworkHeaders) {
-        my $forwardingHeaderPath = File::Spec->catfile($outputDirectory, $framework, basename($header));
+        my $forwardingHeaderPath = File::Spec->catfile($targetDirectory, basename($header));
         my $expectedIncludeStatement = "#include \"$header\"";
         my $foundIncludeStatement = 0;
         $foundIncludeStatement = <EXISTING_HEADER> if open(EXISTING_HEADER, "<$forwardingHeaderPath");

-- 
WebKit Debian packaging