[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87

[hausmann at webkit.org]

The following commit has been merged in the debian/unstable branch:
commit 870c3840a5d8c1cfa155f02a1b7487793c71611f
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 14 14:44:42 2010 +0000

    Add support for "detecting" Symbian environments by either
    looking for the EPOCROOT environment variable or via --symbian
    being passed on the commandline.
    
    Reviewed by Kenneth Rohde Christiansen.
    
    * Scripts/webkitdirs.pm:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53265 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index c4b13ab..6518777 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-14  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Add support for "detecting" Symbian environments by either
+        looking for the EPOCROOT environment variable or via --symbian
+        being passed on the commandline.
+
+        * Scripts/webkitdirs.pm:
+
 2010-01-14  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
 
         Unreviewed.
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 5f44556..43aece8 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -59,6 +59,7 @@ my $sourceDir;
 my $currentSVNRevision;
 my $osXVersion;
 my $isQt;
+my $isSymbian;
 my %qtFeatureDefaults;
 my $isGtk;
 my $isWx;
@@ -239,6 +240,7 @@ sub argumentsForConfiguration()
     push(@args, '--release') if $configuration eq "Release";
     push(@args, '--32-bit') if $architecture ne "x86_64";
     push(@args, '--qt') if isQt();
+    push(@args, '--symbian') if isSymbian();
     push(@args, '--gtk') if isGtk();
     push(@args, '--wx') if isWx();
     push(@args, '--chromium') if isChromium();
@@ -801,6 +803,12 @@ sub isQt()
     return $isQt;
 }
 
+sub isSymbian()
+{
+    determineIsSymbian();
+    return $isSymbian;
+}
+
 sub qtFeatureDefaults()
 {
     determineQtFeatureDefaults();
@@ -851,6 +859,18 @@ sub determineIsQt()
     $isQt = defined($ENV{'QTDIR'});
 }
 
+sub determineIsSymbian()
+{
+    return if defined($isSymbian);
+
+    if (checkForArgumentAndRemoveFromARGV("--symbian")) {
+        $isSymbian = 1;
+        return;
+    }
+
+    $isSymbian = defined($ENV{'EPOCROOT'});
+}
+
 sub isGtk()
 {
     determineIsGtk();

-- 
WebKit Debian packaging