You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2007/09/16 22:50:54 UTC
svn commit: r576172 - /spamassassin/trunk/build/buildbot/master.cfg
Author: jm
Date: Sun Sep 16 13:50:53 2007
New Revision: 576172
URL: http://svn.apache.org/viewvc?rev=576172&view=rev
Log:
oops, bad merge; fix
Modified:
spamassassin/trunk/build/buildbot/master.cfg
Modified: spamassassin/trunk/build/buildbot/master.cfg
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/buildbot/master.cfg?rev=576172&r1=576171&r2=576172&view=diff
==============================================================================
--- spamassassin/trunk/build/buildbot/master.cfg (original)
+++ spamassassin/trunk/build/buildbot/master.cfg Sun Sep 16 13:50:53 2007
@@ -66,7 +66,6 @@
c['bots'] = [
("zone-sol10", read_pwd("zone-sol10")),
- ("sol10-perl561", read_pwd("zone-sol10")),
("t-feisty-561", read_pwd("t-feisty-561")),
("mleisi-suse10.2-x86", read_pwd("mleisl")),
@@ -181,20 +180,6 @@
# now the buildbots that aren't always up...
b1 = { "name": "mleisi-suse10.2-x86", "slavename": "mleisi-suse10.2-x86", "builddir": "mleisi-suse10.2-x86", "factory": bf_generic, }
-e pretty similar to above, but using a specific perl binary
-steps = [
- s(source.SVN, svnurl="http://svn.apache.org/repos/asf/spamassassin/trunk", mode="update"),
- s(shell.Configure, command="perl build/buildbot_ready start perl /tmp/buildbot_sync"),
- s(shell.Configure, command="/local/perl561/bin/perl Makefile.PL < /dev/null"),
- s(shell.Compile, command=["make"]), s(shell.Test, command=["make", "test"]),
- s(shell.Test, command=["make", "distcheck"]),
- s(shell.Test, command="make disttest < /dev/null"),
- s(shell.Configure, command="perl build/buildbot_ready stop perl /tmp/buildbot_sync"),
- ];
-bf_perl_561 = factory.BuildFactory(steps)
-b1 = { "name": "t-sol10-561", "slavename": "sol10-perl561", "builddir": "t-sol10-561", "factory": bf_perl_561, }
-c['builders'].append(b1)
-
c['builders'].append(b1)
b1 = { "name": "mleisi-suse10.2-x86_64", "slavename": "mleisi-suse10.2-x86_64", "builddir": "mleisi-suse10.2-x86_64", "factory": bf_generic, }
@@ -203,38 +188,6 @@
b1 = { "name": "jm-feisty", "slavename": "jm-feisty", "builddir": "jm-feisty", "factory": bf_generic, }
c['builders'].append(b1)
-# b1 = { "name": "t-parker-suse-9.2", "slavename": "parker-suse-9.2", "builddir": "t-parker-suse-9.2", "factory": bf_generic, }
-# c['builders'].append(b1)
-#
-# b1 = { "name": "t-parker-openbsd-3.7", "slavename": "parker-openbsd-3.7", "builddir": "t-parker-openbsd-3.7", "factory": bf_generic, }
-# c['builders'].append(b1)
-
-# b1 = { "name": "t-quinlan-fbsd", "slavename": "quinlan-freebsd-perl585", "builddir": "t-quinlan-freebsd-perl585", "factory": bf_generic, }
-# c['builders'].append(b1)
-#
-# b1 = { "name": "t-sidney-fedora3", "slavename": "sidney-fedora3", "builddir": "t-sidney-fedora3", "factory": bf_generic, }
-# c['builders'].append(b1)
-#
-# b1 = { "name": "t-sidney-cygwin", "slavename": "sidney-cygwin", "builddir": "t-sidney-cygwin", "factory": bf_generic, }
-# c['builders'].append(b1)
-
-# 3.0 branch
-steps = [
- s(source.SVN, svnurl="http://svn.apache.org/repos/asf/spamassassin/branches/3.0", mode="update"),
- s(shell.Configure, command="perl build/buildbot_ready quickstart perl"),
- s(shell.Configure, command="perl Makefile.PL < /dev/null; make distclean; rm -rf Mail-SpamAssassin*"),
- s(shell.Configure, command="perl Makefile.PL < /dev/null"),
- s(shell.Compile, command=["make"]), s(shell.Test, command=["make", "test"]),
- s(shell.Test, command=["make", "distcheck"]),
- s(shell.Test, command="make disttest < /dev/null"),
- ];
-bf_30branch = factory.BuildFactory(steps)
-
-# b1 = { "name": "b3.0-parker-suse-9.2", "slavename": "parker-suse-9.2", "builddir": "b3.0-parker-suse-9.2", "factory": bf_30branch, }
-# c['builders'].append(b1)
-
-# b1 = { "name": "b3.0-parker-freebsd-5.3", "slavename": "parker-freebsd-5.3", "builddir": "b3.0-parker-freebsd-5.3", "factory": bf_30branch, }
-### c['builders'].append(b1)
# These are the steps, from Sidney, for building under win32
#Building in Windows would use, assuming that the environment is set up