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

[bfulgham at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 256f9f2ffbec2375f948099c9604745ddb713ca1
Author: bfulgham at webkit.org <bfulgham at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 30 03:33:41 2010 +0000

    [WinCairo] Adds a build slave.
    https://bugs.webkit.org/show_bug.cgi?id=46360
    
    Patch by Brent Fulgham <bfulgham at webkit.org> on 2010-09-29
    Reviewed by Martin Robinson, Eric Seidel, and Mark Rowe.
    
    * BuildSlaveSupport/build.webkit.org-config/config.json: Add
    entries for a debug build of the WinCairo port.
    * BuildSlaveSupport/build.webkit.org-config/master.cfg: Add
    platform flag to configuration for wincairo (like gtk, chromium, etc.)
    * Scripts/build-webkit: Change 'cairo-win32' labeling to 'wincairo'
    * Scripts/webkitdirs.pm: Change 'cairo-win32' labeling to 'wincairo'
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68744 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json
index 2a4a351..f9391fc 100644
--- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json
+++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json
@@ -45,7 +45,9 @@
                     { "name": "google-windows-2", "platform": "chromium-win" },
                     { "name": "google-mac-2", "platform": "chromium-mac" },
                     { "name": "google-linux-2", "platform": "chromium-linux" },
-                    { "name": "google-new-tests", "platform": "mac-leopard" }
+                    { "name": "google-new-tests", "platform": "mac-leopard" },
+
+                    { "name": "wincairo-1", "platform": "wincairo" }
                   ],
 
     "builders":   [ { "name": "Leopard Intel Release (Build)", "type": "Build", "builddir": "leopard-intel-release",
@@ -194,7 +196,12 @@
                       "name": "New run-webkit-tests", "type": "NewBuildAndTest", "builddir": "google-new-tests",
                       "platform": "mac-leopard", "configuration": "release", "architectures": ["i386"],
                       "slavenames": ["google-new-tests"]
-                    }
+                    },
+                    {
+                      "name": "WinCairo Debug (Build)", "type": "Build", "builddir": "win-cairo-debug",
+                      "platform": "wincairo", "configuration": "debug", "architectures": ["i386"],
+                      "slavenames": ["wincairo-1"]
+                    },
                   ],
 
     "schedulers": [ { "type": "AnyBranchScheduler", "name": "trunk", "change_filter": "trunk_filter", "treeStableTimer": 45.0,
@@ -205,7 +212,8 @@
                                        "Qt Linux Release", "Qt Linux Release minimal", "Qt Linux ARMv5 Release", "Qt Linux ARMv7 Release", 
                                        "Qt Windows 32-bit Release", "Qt Windows 32-bit Debug",
                                        "Chromium Win Release", "Chromium Mac Release", "Chromium Linux Release",
-                                       "Chromium Win Release (Tests)", "Chromium Mac Release (Tests)", "Chromium Linux Release (Tests)"]
+                                       "Chromium Win Release (Tests)", "Chromium Mac Release (Tests)", "Chromium Linux Release (Tests)",
+                                       "WinCairo Debug (Build)"]
                     },
                     { "type": "Triggerable", "name": "leopard-intel-release-tests",
                       "builderNames": ["Leopard Intel Release (Tests)"]
diff --git a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg
index d5cd6fb..319a4ed 100644
--- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg
+++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg
@@ -78,7 +78,7 @@ class CleanupChromiumLinuxCrashLogs(shell.ShellCommand):
 
 
 def appendCustomBuildFlags(step, platform):
-    if platform in ('gtk', 'wx', 'qt', 'chromium'):
+    if platform in ('gtk', 'wx', 'qt', 'chromium', 'wincairo'):
         step.setCommand(step.command + ['--' + platform])
 
 
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 83a26aa..8de808c 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-29  Brent Fulgham  <bfulgham at webkit.org>
+
+        Reviewed by Martin Robinson, Eric Seidel, and Mark Rowe.
+
+        [WinCairo] Adds a build slave.
+        https://bugs.webkit.org/show_bug.cgi?id=46360
+
+        * BuildSlaveSupport/build.webkit.org-config/config.json: Add
+        entries for a debug build of the WinCairo port.
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg: Add
+        platform flag to configuration for wincairo (like gtk, chromium, etc.)
+        * Scripts/build-webkit: Change 'cairo-win32' labeling to 'wincairo'
+        * Scripts/webkitdirs.pm: Change 'cairo-win32' labeling to 'wincairo'
+
 2010-09-29  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/Scripts/build-webkit b/WebKitTools/Scripts/build-webkit
index bc1e8ad..db4d269 100755
--- a/WebKitTools/Scripts/build-webkit
+++ b/WebKitTools/Scripts/build-webkit
@@ -241,7 +241,7 @@ Usage: $programName [options] [options to pass to build system]
   --help                            Show this help message
   --clean                           Cleanup the build directory
   --debug                           Compile in debug mode
-  --cairo-win32                     Build using Cairo (rather than CoreGraphics) on Windows
+  --wincairo                        Build using Cairo (rather than CoreGraphics) on Windows
   --chromium                        Build the Chromium port on Mac/Win/Linux
   --gtk                             Build the GTK+ port
   --qt                              Build the Qt port
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 08e14ab..94ad556 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -415,7 +415,7 @@ sub determinePassedConfiguration
     return if $searchedForPassedConfiguration;
     $searchedForPassedConfiguration = 1;
 
-    my $isWinCairo = checkForArgumentAndRemoveFromARGV("--cairo-win32");
+    my $isWinCairo = checkForArgumentAndRemoveFromARGV("--wincairo");
 
     for my $i (0 .. $#ARGV) {
         my $opt = $ARGV[$i];

-- 
WebKit Debian packaging