2006-10-01 Mark Rowe <opendarwin.org@bdash.net.nz>

        Reviewed by Maciej.

        Add QT build slave to Buildbot.

        * BuildSlaveSupport/build.webkit.org-config/webkit/builders.py: Add QT build slave, fix existing errors.
        * BuildSlaveSupport/build.webkit.org-config/webkit/factories.py: Add QT build factory.
        * BuildSlaveSupport/build.webkit.org-config/webkit/status.py: Disable forcing of builds via web interface to prevent spamming.  Use the IRC bot in #webkit-build instead.
        * BuildSlaveSupport/build.webkit.org-config/webkit/steps.py: Add CMake build step.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16704 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/webkit/builders.py b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/webkit/builders.py
index b74effc99276176312f84251b177bcec5b76474a..b85b8bfe6d001e7da79cb4f27cd1203e342f38b6 100644 (file)
--- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/webkit/builders.py
+++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/webkit/builders.py
@@ -1,11 +1,12 @@
 from webkit.factories import *
 
-_builders = [('post-commit-powerpc-mac-os-x', StandardBuildFactory, ['apple-slave-6', 'apple-slave-5'])
-             ('post-commit-leaks-powerpc-mac-os-x', LeakBuildFactory, ['apple-slave-5', 'apple-slave-6'])
+_builders = [('post-commit-powerpc-mac-os-x', StandardBuildFactory, ['apple-slave-6', 'apple-slave-5']),
+             ('post-commit-leaks-powerpc-mac-os-x', LeakBuildFactory, ['apple-slave-5', 'apple-slave-6']),
              ('page-layout-test-mac-os-x', PageLoadTestBuildFactory, ['apple-slave-1']),
-             ('post-commit-pixel-powerpc-mac-os-x', PixelTestBuildFactory, ['apple-slave-3', 'apple-slave-4'])
+             ('post-commit-pixel-powerpc-mac-os-x', PixelTestBuildFactory, ['apple-slave-3', 'apple-slave-4']),
              ('post-commit-win32', Win32BuildFactory, ['apple-slave-2']),
-             ('periodic-powerpc-mac-os-x-no-svg', NoSVGBuildFactory, ['apple-slave-4', 'apple-slave-3'])
+             ('periodic-powerpc-mac-os-x-no-svg', NoSVGBuildFactory, ['apple-slave-4', 'apple-slave-3']),
+             ('post-commit-linux-qt', QTBuildFactory, ['wildfox-slave-1']),
              ]
 
 def getBuilders():

diff --git a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/webkit/factories.py b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/webkit/factories.py
index 05ec90c61e1d46c065b3ced4ce2717e51000d107..c4779f01098787eb3c8a622aee54e84f2b0e2343 100644 (file)
--- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/webkit/factories.py
+++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/webkit/factories.py
@@ -58,3 +58,8 @@ class Win32BuildFactory(BuildFactory):
         self.steps.append(s(CompileWebKit, configuration="release"))
         self.steps.append(s(JavaScriptCoreTest))
         self.steps.append(s(LayoutTest))
+
+class QTBuildFactory(BuildFactory):
+    def __init__(self):
+        BuildFactory.__init__(self)
+        self.steps.append(s(CompileWebKitCMake))

diff --git a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/webkit/status.py b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/webkit/status.py
index cf7ee3bdaa95de32713da2fd8d61b68e54e6fc32..191ea808a3335c6f42eebdc0bba880abb938a7e6 100644 (file)
--- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/webkit/status.py
+++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/webkit/status.py
@@ -14,7 +14,7 @@ class MyWaterfall(html.Waterfall):
                 request.path = '/' + '/'.join(request.prepath + request.postpath)
         self.site.resource = RewriterResource(rootResource, rewriteXSL)
         
-waterfall = MyWaterfall(http_port=8010, css="buildbot.css", results_directory="/home/buildresults/results/")
+waterfall = MyWaterfall(http_port=8010, css="buildbot.css", results_directory="/home/buildresults/results/", allowForce=False)
 
 allBuildsEmail = mail.MailNotifier(fromaddr="buildbot@webkit.org",
                                     extraRecipients=["mark+webkit-builds@bdash.net.nz"],

diff --git a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/webkit/steps.py b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/webkit/steps.py
index df5474bfe41ef046b490f1d9f093dfb07a4d3214..462d7a35ce6b4afec83b51bd4eea33f0b7e30333 100644 (file)
--- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/webkit/steps.py
+++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/webkit/steps.py
@@ -118,6 +118,10 @@ class UploadLayoutResults(UploadCommand, ShellCommand):
 
         ShellCommand.__init__(self, *args, **kwargs)
 
+class CompileWebKitCMake(Compile):
+    command = "mkdir -p WebKitBuild && cd WebKitBuild && cmake -DWEBKIT_DO_NOT_USE_COLORFUL_OUTPUT=ON .. && make"
+    description = ["compiling"]
+    descriptionDone = ["compiled"]
 
 class CompileWebKit(Compile):
     command = ["./WebKitTools/Scripts/build-webkit"]

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index cad4d969e1d728d285cafd3c3164b72e645f32b7..3bcb71015a28cacc6f6872ab513889e148e727c1 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2006-10-01  Mark Rowe  <opendarwin.org@bdash.net.nz>
+
+        Reviewed by Maciej.
+
+        Add QT build slave to Buildbot.
+
+        * BuildSlaveSupport/build.webkit.org-config/webkit/builders.py: Add QT build slave, fix existing errors.
+        * BuildSlaveSupport/build.webkit.org-config/webkit/factories.py: Add QT build factory.
+        * BuildSlaveSupport/build.webkit.org-config/webkit/status.py: Disable forcing of builds via web interface to prevent spamming.  Use the IRC bot in #webkit-build instead.
+        * BuildSlaveSupport/build.webkit.org-config/webkit/steps.py: Add CMake build step.
+
 2006-09-28  David Harrison  <harrison@apple.com>
 
         Suggested by Darin.