[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[ossy at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 8219a7704bc02e8b268f068ecfa20d0eeaf31610
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jan 2 21:16:52 2011 +0000

    Move JavaScriptCore to Source
    https://bugs.webkit.org/show_bug.cgi?id=51604
    
    Reviewed by Adam Barth.
    
    Workaround until moving all sources to Source directory is finished.
    
    * Scripts/generate-forwarding-headers.pl: Add Sources to searching path for JavaScriptCore.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74873 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 04921b1..2b08160 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-02  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Move JavaScriptCore to Source
+        https://bugs.webkit.org/show_bug.cgi?id=51604
+
+        Workaround until moving all sources to Source directory is finished.
+
+        * Scripts/generate-forwarding-headers.pl: Add Sources to searching path for JavaScriptCore.
+
 2011-01-01  Adam Barth  <abarth at webkit.org>
 
         Speculative build fix for Qt.  Add some more include paths.
diff --git a/WebKit2/Scripts/generate-forwarding-headers.pl b/WebKit2/Scripts/generate-forwarding-headers.pl
index d5abb5b..a733973 100755
--- a/WebKit2/Scripts/generate-forwarding-headers.pl
+++ b/WebKit2/Scripts/generate-forwarding-headers.pl
@@ -40,6 +40,7 @@ my @frameworks = ( "JavaScriptCore", "WebCore", "WebKit2");
 my @skippedPrefixes;
 my @frameworkHeaders;
 my $framework;
+my $sourceDirectoryInPath;
 my %neededHeaders;
 
 shift;
@@ -53,8 +54,15 @@ foreach my $prefix (@platformPrefixes) {
 
 foreach (@frameworks) {
     $framework = $_;
+
+    #FIXME: Workaround until moving all sources to Source directory is finished.
+    if ($framework eq "JavaScriptCore") {
+        $sourceDirectoryInPath = "Source";
+    } else {
+        $sourceDirectoryInPath = "";
+    }
     find(\&collectNeededHeaders, $incFromRoot);
-    find(\&collectFameworkHeaderPaths, File::Spec->catfile($srcRoot, $framework));
+    find(\&collectFameworkHeaderPaths, File::Spec->catfile($srcRoot, $sourceDirectoryInPath, $framework));
     createForwardingHeadersForFramework();
 }
 
@@ -76,7 +84,7 @@ sub collectFameworkHeaderPaths {
     my $filePath = $File::Find::name;
     my $file = $_;
     if ($filePath =~ '\.h$' && $filePath !~ "ForwardingHeaders" && grep{$file eq $_} keys %neededHeaders) {
-        my $headerPath = substr($filePath, length("$srcRoot/$framework/"));
+        my $headerPath = substr($filePath, length(File::Spec->catfile($srcRoot, $sourceDirectoryInPath, $framework)) + 1 );
         push(@frameworkHeaders, $headerPath) unless (grep($headerPath =~ "$_/", @skippedPrefixes));
     }
 }

-- 
WebKit Debian packaging