[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[ossy at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 6acbb2d035e16c4d6553f51619fadb269c70845f
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 27 12:30:01 2011 +0000

    [Qt] [Symbian] Move project files into Source
    https://bugs.webkit.org/show_bug.cgi?id=52891
    
    Patch by Laszlo Gombos <laszlo.1.gombos at nokia.com> on 2011-01-27
    Reviewed by Csaba Osztrogonác.
    
    Fix the Symbian build after the project files
    are moved to Source directory. On Symbian qmake
    needs to run in the same directory where the main
    pro files (WebKit.pro, Tools.pro) are located.
    
    * Scripts/webkitdirs.pm: Change to the directory where the pro file
    is located before running qmake for Symbian. Qmake on Symbian
    does not properly honor the "-o" option, work it around by setting
    the name of the Makefile to bld.inf.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76785 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index e2d7aaf..a7257d4 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,20 @@
+2011-01-27  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Csaba Osztrogonác.
+
+        [Qt] [Symbian] Move project files into Source
+        https://bugs.webkit.org/show_bug.cgi?id=52891
+
+        Fix the Symbian build after the project files
+        are moved to Source directory. On Symbian qmake
+        needs to run in the same directory where the main
+        pro files (WebKit.pro, Tools.pro) are located.
+
+        * Scripts/webkitdirs.pm: Change to the directory where the pro file
+        is located before running qmake for Symbian. Qmake on Symbian
+        does not properly honor the "-o" option, work it around by setting
+        the name of the Makefile to bld.inf.
+
 2011-01-27  Zoltan Horvath  <zoltan at webkit.org>
 
         Reviewed by Andreas Kling.
diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index 1272bb8..9ee56d3 100644
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -1571,6 +1571,13 @@ sub buildQMakeProject($@)
     push @buildArgs, "INSTALL_HEADERS=" . $installHeaders if defined($installHeaders);
     push @buildArgs, "INSTALL_LIBS=" . $installLibs if defined($installLibs);
     my $dir = File::Spec->canonpath(productDir());
+
+
+    # On Symbian qmake needs to run in the same directory where the pro file is located.
+    if (isSymbian()) {
+        $dir = $sourceDir . "/Source";
+    }
+
     File::Path::mkpath($dir);
     chdir $dir or die "Failed to cd into " . $dir . "\n";
 
@@ -1648,9 +1655,17 @@ sub buildQMakeProject($@)
     }
 
     $buildArgs[-1] = sourceDir() . "/Tools/Tools.pro";
-    print "Calling '$qmakebin @buildArgs -o Makefile.Tools' in " . $dir . "\n\n";
+    my $makefile = "Makefile.Tools";
+
+    # On Symbian qmake needs to run in the same directory where the pro file is located.
+    if (isSymbian()) {
+        $dir = $sourceDir . "/Tools";
+        chdir $dir or die "Failed to cd into " . $dir . "\n";
+        $makefile = "bld.inf";
+    }
 
-    $result = system "$qmakebin @buildArgs -o Makefile.Tools";
+    print "Calling '$qmakebin @buildArgs -o $makefile' in " . $dir . "\n\n";
+    $result = system "$qmakebin @buildArgs -o $makefile";
     if ($result ne 0) {
        die "Failed to setup build environment using $qmakebin!\n";
     }
@@ -1667,8 +1682,8 @@ sub buildQMakeProject($@)
 
     my $makeTools = "echo No Makefile for Tools. Skipping make";
 
-    if (-e "$dir/Makefile.Tools") {
-        $makeTools = "$make $makeargs -f Makefile.Tools";
+    if (-e "$dir/$makefile") {
+        $makeTools = "$make $makeargs -f $makefile";
     }
 
     if ($clean) {

-- 
WebKit Debian packaging