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

ddkilzer at apple.com ddkilzer at apple.com
Wed Dec 22 14:54:31 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 3e743d3de82ffd867cc251f932fcb4065bf90ec1
Author: ddkilzer at apple.com <ddkilzer at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Oct 24 13:49:39 2010 +0000

    <http://webkit.org/b/48184> build-webkit: reformat support variables for better maintainability
    
    Reviewed by Daniel Bates.
    
    * Scripts/build-webkit: Alphabetized the @features array based
    on the name of the feature.  Reformatted the list of support
    variables so that they match the order of @features, and so that
    each has its own line.  This makes it easy to add new variables
    in the correct order.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70412 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 2c0df1a..658c8c7 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-24  David Kilzer  <ddkilzer at apple.com>
+
+        <http://webkit.org/b/48184> build-webkit: reformat support variables for better maintainability
+
+        Reviewed by Daniel Bates.
+
+        * Scripts/build-webkit: Alphabetized the @features array based
+        on the name of the feature.  Reformatted the list of support
+        variables so that they match the order of @features, and so that
+        each has its own line.  This makes it easy to add new variables
+        in the correct order.
+
 2010-10-23  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/Scripts/build-webkit b/WebKitTools/Scripts/build-webkit
index e7f9d1f..339b5be 100755
--- a/WebKitTools/Scripts/build-webkit
+++ b/WebKitTools/Scripts/build-webkit
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-# Copyright (C) 2005, 2006 Apple Inc. All rights reserved.
+# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
 # Copyright (C) 2009 Google Inc. All rights reserved.
 # Copyright (C) 2010 moiji-mobile.com All rights reserved.
 #
@@ -57,27 +57,66 @@ my $prefixPath;
 my $makeArgs;
 my $startTime = time();
 
-my ($linkPrefetchSupport, $accelerated2dCanvasSupport, $threeDCanvasSupport, $threeDRenderingSupport, $channelMessagingSupport, $clientBasedGeolocationSupport, $databaseSupport, $datagridSupport, $datalistSupport,
-    $domStorageSupport, $eventsourceSupport, $filtersSupport, $geolocationSupport, $iconDatabaseSupport, $imageResizerSupport, $indexedDatabaseSupport, $inputSpeechSupport,
-    $javaScriptDebuggerSupport, $mathmlSupport, $offlineWebApplicationSupport, $rubySupport, $systemMallocSupport, $sandboxSupport, $sharedWorkersSupport,
-    $svgSupport, $svgAnimationSupport, $svgAsImageSupport, $svgDOMObjCBindingsSupport, $svgFontsSupport,
-    $svgForeignObjectSupport, $svgUseSupport, $videoSupport, $webSocketsSupport, $webTimingSupport, $wmlSupport, $wcssSupport, $xhtmlmpSupport, $workersSupport,
-    $xpathSupport, $xsltSupport, $coverageSupport, $notificationsSupport, $blobSupport, $tiledBackingStoreSupport,
-    $fileWriterSupport, $fileSystemSupport, $directoryUploadSupport, $deviceOrientationSupport);
+my (
+    $threeDCanvasSupport,
+    $threeDRenderingSupport,
+    $accelerated2dCanvasSupport,
+    $blobSupport,
+    $channelMessagingSupport,
+    $clientBasedGeolocationSupport,
+    $coverageSupport,
+    $databaseSupport,
+    $datagridSupport,
+    $datalistSupport,
+    $deviceOrientationSupport,
+    $directoryUploadSupport,
+    $domStorageSupport,
+    $eventsourceSupport,
+    $fileSystemSupport,
+    $filtersSupport,
+    $geolocationSupport,
+    $iconDatabaseSupport,
+    $imageResizerSupport,
+    $indexedDatabaseSupport,
+    $inputSpeechSupport,
+    $javaScriptDebuggerSupport,
+    $linkPrefetchSupport,
+    $mathmlSupport,
+    $notificationsSupport,
+    $offlineWebApplicationSupport,
+    $rubySupport,
+    $sandboxSupport,
+    $sharedWorkersSupport,
+    $svgSupport,
+    $svgAnimationSupport,
+    $svgAsImageSupport,
+    $svgDOMObjCBindingsSupport,
+    $svgFontsSupport,
+    $svgForeignObjectSupport,
+    $svgUseSupport,
+    $systemMallocSupport,
+    $tiledBackingStoreSupport,
+    $videoSupport,
+    $wcssSupport,
+    $webSocketsSupport,
+    $webTimingSupport,
+    $wmlSupport,
+    $workersSupport,
+    $xhtmlmpSupport,
+    $xpathSupport,
+    $xsltSupport,
+);
 
 my @features = (
-    { option => "link-prefetch", desc => "Toggle pre fetching support",
-      define => "ENABLE_LINK_PREFETCH", default => 0, value => \$linkPrefetchSupport },
-
-    { option => "accelerated-2d-canvas", desc => "Toggle accelerated 2D canvas support",
-      define => "ENABLE_ACCELERATED_2D_CANVAS", default => 0, value => \$accelerated2dCanvasSupport },
-
     { option => "3d-canvas", desc => "Toggle 3D canvas support",
       define => "ENABLE_3D_CANVAS", default => (isAppleMacWebKit() && !isTiger() && !isLeopard()), value => \$threeDCanvasSupport },
 
     { option => "3d-rendering", desc => "Toggle 3D rendering support",
       define => "ENABLE_3D_RENDERING", default => (isAppleMacWebKit() && !isTiger()), value => \$threeDRenderingSupport },
 
+    { option => "accelerated-2d-canvas", desc => "Toggle accelerated 2D canvas support",
+      define => "ENABLE_ACCELERATED_2D_CANVAS", default => 0, value => \$accelerated2dCanvasSupport },
+
     { option => "blob", desc => "Toggle Blob support",
       define => "ENABLE_BLOB", default => (isAppleMacWebKit()), value => \$blobSupport },
 
@@ -95,10 +134,13 @@ my @features = (
 
     { option => "datagrid", desc => "Toggle Datagrid Support",
       define => "ENABLE_DATAGRID", default => 0, value => \$datagridSupport },
-      
+
     { option => "datalist", desc => "Toggle HTML5 datalist support",
       define => "ENABLE_DATALIST", default => 1, value => \$datalistSupport },
-          
+
+    { option => "device-orientation", desc => "Toggle DeviceOrientation support",
+      define => "ENABLE_DEVICE_ORIENTATION", default => 0, value => \$deviceOrientationSupport },
+
     { option => "directory-upload", desc => "Toogle Directory upload support",
       define => "ENABLE_DIRECTORY_UPLOAD", default => 0, value => \$directoryUploadSupport },
 
@@ -108,6 +150,9 @@ my @features = (
     { option => "eventsource", desc => "Toggle server-sent events support",
       define => "ENABLE_EVENTSOURCE", default => 1, value => \$eventsourceSupport },
 
+    { option => "file-system", desc => "Toggle FileSystem support",
+      define => "ENABLE_FILE_SYSTEM", default => 0, value => \$fileSystemSupport },
+
     { option => "filters", desc => "Toggle Filters support",
       define => "ENABLE_FILTERS", default => (isAppleWebKit() || isGtk() || isQt() || isEfl()), value => \$filtersSupport },
 
@@ -116,7 +161,7 @@ my @features = (
 
     { option => "icon-database", desc => "Toggle Icon database support",
       define => "ENABLE_ICONDATABASE", default => 1, value => \$iconDatabaseSupport },
-      
+
     { option => "image-resizer", desc => "Toggle Image Resizer API support",
       define => "ENABLE_IMAGE_RESIZER", default => 0, value => \$imageResizerSupport },
 
@@ -129,6 +174,9 @@ my @features = (
     { option => "javascript-debugger", desc => "Toggle JavaScript Debugger/Profiler support",
       define => "ENABLE_JAVASCRIPT_DEBUGGER", default => 1, value => \$javaScriptDebuggerSupport },
 
+    { option => "link-prefetch", desc => "Toggle pre fetching support",
+      define => "ENABLE_LINK_PREFETCH", default => 0, value => \$linkPrefetchSupport },
+
     { option => "mathml", desc => "Toggle MathML support",
       define => "ENABLE_MATHML", default => 1, value => \$mathmlSupport },
 
@@ -177,6 +225,9 @@ my @features = (
     { option => "video", desc => "Toggle Video support",
       define => "ENABLE_VIDEO", default => (isAppleWebKit() || isGtk()), value => \$videoSupport },
 
+    { option => "wcss", desc => "Toggle WCSS support",
+      define => "ENABLE_WCSS", default => 0, value => \$wcssSupport },
+
     { option => "web-sockets", desc => "Toggle Web Sockets support",
       define => "ENABLE_WEB_SOCKETS", default => 1, value=> \$webSocketsSupport },
 
@@ -186,26 +237,17 @@ my @features = (
     { option => "wml", desc => "Toggle WML support",
       define => "ENABLE_WML", default => 0, value => \$wmlSupport },
 
-    { option => "xhtmlmp", desc => "Toggle XHTML-MP support",
-      define => "ENABLE_XHTMLMP", default => 0, value => \$xhtmlmpSupport },
-
-    { option => "wcss", desc => "Toggle WCSS support",
-      define => "ENABLE_WCSS", default => 0, value => \$wcssSupport },
-
     { option => "workers", desc => "Toggle Web Workers support",
       define => "ENABLE_WORKERS", default => (isAppleWebKit() || isGtk()), value => \$workersSupport },
 
+    { option => "xhtmlmp", desc => "Toggle XHTML-MP support",
+      define => "ENABLE_XHTMLMP", default => 0, value => \$xhtmlmpSupport },
+
     { option => "xpath", desc => "Toggle XPath support",
       define => "ENABLE_XPATH", default => 1, value => \$xpathSupport },
 
     { option => "xslt", desc => "Toggle XSLT support",
       define => "ENABLE_XSLT", default => 1, value => \$xsltSupport },
-
-    { option => "file-system", desc => "Toggle FileSystem support",
-      define => "ENABLE_FILE_SYSTEM", default => 0, value => \$fileSystemSupport },
-
-    { option => "device-orientation", desc => "Toggle DeviceOrientation support",
-      define => "ENABLE_DEVICE_ORIENTATION", default => 0, value => \$deviceOrientationSupport },
 );
 
 # Update defaults from Qt's project file

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list