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

[mihaip at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 4c8fce69daefba91413553c721c6973d139aaedb
Author: mihaip at chromium.org <mihaip at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 14 00:55:03 2010 +0000

    2010-12-13  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by James Robinson.
    
            Add option to build-webkit to not build WebKit2
            https://bugs.webkit.org/show_bug.cgi?id=50988
    
            Add support for a --no-webkit2 option to build-webkit. It seems to save
            ~1 minute from clean builds and ~10 seconds from no-op builds.
    
            * Scripts/build-webkit:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73985 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index fd84ef7..3306547 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-13  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by James Robinson.
+
+        Add option to build-webkit to not build WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=50988
+        
+        Add support for a --no-webkit2 option to build-webkit. It seems to save
+        ~1 minute from clean builds and ~10 seconds from no-op builds.
+
+        * Scripts/build-webkit:
+
 2010-12-13  Lucas Forschler  <lforschler at apple.com>
 
         Reviewed by Dave Kilzer.
diff --git a/WebKitTools/Scripts/build-webkit b/WebKitTools/Scripts/build-webkit
index 7518bea..cb03538 100755
--- a/WebKitTools/Scripts/build-webkit
+++ b/WebKitTools/Scripts/build-webkit
@@ -55,6 +55,7 @@ my $installHeaders;
 my $installLibs;
 my $prefixPath;
 my $makeArgs;
+my $noWebKit2 = 0;
 my $startTime = time();
 
 my (
@@ -325,6 +326,7 @@ my %options = (
     'makeargs=s' => \$makeArgs,
     'minimal' => \$minimal,
     'v8' => \$v8,
+    'no-webkit2' => \$noWebKit2,
 );
 
 # Build usage text and options list from features
@@ -403,7 +405,7 @@ if (isGtk()) {
     splice @projects, 0, 0, "ANGLE";
 
     # WebKit2 is only supported in SnowLeopard and later at present.
-    push @projects, ("WebKit2", "WebKitTools/MiniBrowser") if osXVersion()->{"minor"} >= 6;
+    push @projects, ("WebKit2", "WebKitTools/MiniBrowser") if osXVersion()->{"minor"} >= 6 and !$noWebKit2;
 
     # Copy library and header from WebKitLibraries to a findable place in the product directory.
     my @librariesToCopy = (

-- 
WebKit Debian packaging