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

[laszlo.1.gombos at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 05c22c3a486b1f8926cae17c1d00840be91fe061
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 30 23:30:31 2010 +0000

    2010-12-30  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by David Kilzer.
    
            [Qt] [Symbian] Fix build-webkit script for Symbian
            https://bugs.webkit.org/show_bug.cgi?id=51509
    
            Set the OUTPUT_DIR for Symbian to be the same as the source
            directory.
    
            * Scripts/webkitdirs.pm:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74811 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index b9c8313..bcf0e37 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-30  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by David Kilzer.
+
+        [Qt] [Symbian] Fix build-webkit script for Symbian
+        https://bugs.webkit.org/show_bug.cgi?id=51509
+
+        Set the OUTPUT_DIR for Symbian to be the same as the source
+        directory.
+
+        * Scripts/webkitdirs.pm:
+
 2010-12-30  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Darin Adler.
diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index 68b17e5..60a3f90 100644
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -286,6 +286,17 @@ sub determineConfigurationForVisualStudio
     $configurationForVisualStudio = $configuration;
 }
 
+sub usesPerConfigurationBuildDirectory
+{
+    # [Gtk][Efl] We don't have Release/Debug configurations in straight
+    # autotool builds (non build-webkit). In this case and if
+    # WEBKITOUTPUTDIR exist, use that as our configuration dir. This will
+    # allows us to run run-webkit-tests without using build-webkit.
+    #
+    # Symbian builds do not have Release/Debug configurations either.
+    return ($ENV{"WEBKITOUTPUTDIR"} && (isGtk() || isEfl())) || isSymbian();
+}
+
 sub determineConfigurationProductDir
 {
     return if defined $configurationProductDir;
@@ -294,11 +305,7 @@ sub determineConfigurationProductDir
     if (isAppleWinWebKit() && !isWx()) {
         $configurationProductDir = File::Spec->catdir($baseProductDir, "bin");
     } else {
-        # [Gtk][Efl] We don't have Release/Debug configurations in straight
-        # autotool builds (non build-webkit). In this case and if
-        # WEBKITOUTPUTDIR exist, use that as our configuration dir. This will
-        # allows us to run run-webkit-tests without using build-webkit.
-        if ($ENV{"WEBKITOUTPUTDIR"} && (isGtk() || isEfl())) {
+        if (usesPerConfigurationBuildDirectory()) {
             $configurationProductDir = "$baseProductDir";
         } else {
             $configurationProductDir = "$baseProductDir/$configuration";
@@ -1526,14 +1533,13 @@ sub buildQMakeProject($@)
     my $config = configuration();
     push @buildArgs, "INSTALL_HEADERS=" . $installHeaders if defined($installHeaders);
     push @buildArgs, "INSTALL_LIBS=" . $installLibs if defined($installLibs);
-    my $dir = File::Spec->canonpath(baseProductDir());
-    $dir = File::Spec->catfile($dir, $config) unless isSymbian();
+    my $dir = File::Spec->canonpath(productDir());
     File::Path::mkpath($dir);
     chdir $dir or die "Failed to cd into " . $dir . "\n";
 
     print "Generating derived sources\n\n";
 
-    push @buildArgs, "OUTPUT_DIR=" . baseProductDir() . "/$config";
+    push @buildArgs, "OUTPUT_DIR=" . $dir;
 
     my @dsQmakeArgs = @buildArgs;
     push @dsQmakeArgs, "-r";

-- 
WebKit Debian packaging