[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 41113270ba9fd5e02e01858236d19c9af4adae53
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 13 11:19:05 2010 +0000

    2010-09-13  Andreas Kling  <andreas.kling at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] build-webkit: Add --v8 option to build against V8
    
            Note that V8 is picked up from QtScript, so this currently requires building
            against the experimental qt-script-v8 branch.
    
            * Scripts/build-webkit:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67379 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 6d2bc0e..8ddeb83 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-13  Andreas Kling  <andreas.kling at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] build-webkit: Add --v8 option to build against V8
+
+        Note that V8 is picked up from QtScript, so this currently requires building
+        against the experimental qt-script-v8 branch.
+
+        * Scripts/build-webkit:
+
 2010-09-13  Hans Wennborg  <hans at chromium.org>
 
         Reviewed by Jeremy Orlow.
diff --git a/WebKitTools/Scripts/build-webkit b/WebKitTools/Scripts/build-webkit
index 4234905..81189af 100755
--- a/WebKitTools/Scripts/build-webkit
+++ b/WebKitTools/Scripts/build-webkit
@@ -50,6 +50,7 @@ chdirWebKit();
 my $showHelp = 0;
 my $clean = 0;
 my $minimal = 0;
+my $v8 = 0;
 my $installHeaders;
 my $installLibs;
 my $prefixPath;
@@ -222,7 +223,8 @@ push @ARGV, split(/ /, $ENV{'BUILD_WEBKIT_ARGS'}) if ($ENV{'BUILD_WEBKIT_ARGS'})
 foreach (@ARGV) {
     if ($_ eq '--minimal') {
         $minimal = 1;
-        last;
+    } elsif ($_ eq '--v8') {
+        $v8 = 1;
     }
 }
 
@@ -250,6 +252,7 @@ Usage: $programName [options] [options to pass to build system]
 
   --install-headers=<path>          Set installation path for the headers (Qt only)
   --install-libs=<path>             Set installation path for the libraries (Qt only)
+  --v8                              Use V8 as JavaScript engine (Qt only)
 
   --prefix=<path>                   Set installation prefix to the given path (Gtk only)
   --makeargs=<arguments>            Optional Makefile flags
@@ -266,6 +269,7 @@ my %options = (
     'prefix=s' => \$prefixPath,
     'makeargs=s' => \$makeArgs,
     'minimal' => \$minimal,
+    'v8' => \$v8,
 );
 
 # Build usage text and options list from features
@@ -395,6 +399,10 @@ if (isGtk()) {
     if ($minimal) {
         push @options, "CONFIG+=minimal";
     }
+
+    if ($v8) {
+        push @options, "CONFIG+=v8";
+    }
 }
 
 # Force re-link of existing libraries if different than expected

-- 
WebKit Debian packaging