[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 883f3938b270b6856d85068629f1200afaa54bcd
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 14 14:52:53 2010 +0000

    Add support for partial building on Symbian.
    
    Patch by Jocelyn Turcotte <jocelyn.turcotte at nokia.com> on 2010-01-14
    Reviewed by Simon Hausmann.
    
    The build happens in the source directory as out of source builds are
    not supported by qmake for Symbian.
    
    Also the actual build isn't started but it is left to the developer
    to choose the architecture/configuration.
    
    * Scripts/webkitdirs.pm:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53266 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 6518777..0eee23a 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-01-14  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        Add support for partial building on Symbian.
+
+        The build happens in the source directory as out of source builds are
+        not supported by qmake for Symbian.
+
+        Also the actual build isn't started but it is left to the developer
+        to choose the architecture/configuration.
+
+        * Scripts/webkitdirs.pm:
+
 2010-01-14  Simon Hausmann  <simon.hausmann at nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 43aece8..6d6de56 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -140,6 +140,9 @@ sub determineBaseProductDir
                 undef $baseProductDir unless $baseProductDir =~ /^\//;
             }
         }
+    } elsif (isSymbian()) {
+        # Shadow builds are not supported on Symbian
+        $baseProductDir = $sourceDir;
     }
 
     if (!defined($baseProductDir)) { # Port-spesific checks failed, use default
@@ -1471,8 +1474,7 @@ sub buildQMakeProject($@)
     my $config = configuration();
     my $prefix = $ENV{"WebKitInstallationPrefix"};
     my $dir = File::Spec->canonpath(baseProductDir());
-    File::Path::mkpath($dir);
-    $dir = File::Spec->catfile($dir, $config);
+    $dir = File::Spec->catfile($dir, $config) unless isSymbian();
     File::Path::mkpath($dir);
     chdir $dir or die "Failed to cd into " . $dir . "\n";
 
@@ -1493,7 +1495,7 @@ sub buildQMakeProject($@)
     my $dsMakefile = "Makefile.DerivedSources";
     # This is to overcome a problem of qmake when generating Makefiles with extra targets for windows.
     # The configuration doesn't matter for source generation, just use debug.
-    $dsMakefile .= ".Debug" if (isCygwin() || isWindows());
+    $dsMakefile .= ".Debug" if ((isCygwin() || isWindows()) && !isSymbian());
 
     print "Calling '$make $makeargs -f $dsMakefile generated_files' in " . $dir . "/JavaScriptCore\n\n";
     if ($make eq "nmake") {
@@ -1543,6 +1545,10 @@ sub buildQMakeProject($@)
     if ($clean) {
       print "Calling '$make $makeargs distclean' in " . $dir . "\n\n";
       $result = system "$make $makeargs distclean";
+    } elsif (isSymbian()) {
+      print "\n\nWebKit is now configured for building, but you have to make\n";
+      print "a choice about the target yourself. To start the build run:\n\n";
+      print "    make release-armv5|debug-winscw|etc.\n\n";
     } else {
       print "Calling '$make $makeargs' in " . $dir . "\n\n";
       $result = system "$make $makeargs";

-- 
WebKit Debian packaging