Add a new buildslave (shoyu) and Doxygen build factory, this is just a stub now I'll add it in a later commit.

Originally committed to SVN as r3314.
This commit is contained in:
Amar Takhar 2009-07-29 23:29:00 +00:00
parent 9dd3e9f2e2
commit 7ef2e4f764
2 changed files with 59 additions and 4 deletions

View file

@ -6,6 +6,7 @@ passwd = {
'anpan': '', 'anpan': '',
'tako': '', 'tako': '',
'nori': '', 'nori': '',
'mokona': '' 'mokona': '',
'shoyu': ''
} }

View file

@ -64,6 +64,17 @@ re_windows = [
'^trunk/aegisub/src/msvc/.*' '^trunk/aegisub/src/msvc/.*'
] ]
re_doxygen = [
'^trunk/aegisub/docs/doxygen/.*',
'^trunk/aegisub/src/.*\.c$',
'^trunk/aegisub/src/.*\.cpp$',
'^trunk/aegisub/src/.*\.h$',
'^trunk/aegisub/src/libosxutil/.*\.h$',
'^trunk/aegisub/src/libosxutil/.*\.c$',
'^trunk/aegisub/src/include/aegisub/.*'
]
import re, string import re, string
def check_changes(files, re_array): def check_changes(files, re_array):
re_compiled = re.compile(string.joinfields(re_array, "|"), re.I) re_compiled = re.compile(string.joinfields(re_array, "|"), re.I)
@ -81,6 +92,9 @@ def interested_unix(change):
def interested_osx(change): def interested_osx(change):
return check_changes(change.files, re_common + re_common_unix + re_osx) return check_changes(change.files, re_common + re_common_unix + re_osx)
def interested_doxygen(change):
return check_changes(change.files, re_doxygen)
############# #############
@ -94,7 +108,8 @@ c['slaves'] = [
BuildSlave("anpan", passwd['anpan'], max_builds=1, properties={'os':'Windows', 'version':'SP2', 'osname':'Vista'}), BuildSlave("anpan", passwd['anpan'], max_builds=1, properties={'os':'Windows', 'version':'SP2', 'osname':'Vista'}),
BuildSlave("tako", passwd['tako'], max_builds=1, properties={'os':'FreeBSD', 'version':'7.1', 'osname':'Stable'}), BuildSlave("tako", passwd['tako'], max_builds=1, properties={'os':'FreeBSD', 'version':'7.1', 'osname':'Stable'}),
BuildSlave("nori", passwd['nori'], max_builds=1, properties={'os':'Ubuntu', 'version':'9.04', 'osname':'Jaunty'}), BuildSlave("nori", passwd['nori'], max_builds=1, properties={'os':'Ubuntu', 'version':'9.04', 'osname':'Jaunty'}),
BuildSlave("mokona", passwd['mokona'], max_builds=1, properties={'os':'OSX', 'version': '10.4.11', 'osname':'Tiger'}) BuildSlave("mokona", passwd['mokona'], max_builds=1, properties={'os':'OSX', 'version': '10.4.11', 'osname':'Tiger'}),
BuildSlave("shoyu", passwd['shoyu'], max_builds=2, properties={'os':'Linux', 'version': '???', 'osname':'???'})
] ]
@ -573,6 +588,32 @@ fwin64.addStep(agi_upload(
flunkOnFailure=False flunkOnFailure=False
) )
#########
# Factory
# WWW
#########
fwww_dox = factory.BuildFactory()
fwww_dox.addStep(source.SVN(mode="clobber", svnurl=source_unix))
fwww_dox.addStep(shell.ShellCommand(
name = "autogen",
description = "autogening",
descriptionDone = "autogen",
haltOnFailure=True,
command=["./autogen.sh", "--skip-configure"],
env={
'ACLOCAL_FLAGS': '-I /Users/verm/prefix/share/aclocal',
'AUTOMAKE': '/Users/verm/prefix/bin/automake-1.9',
'ACLOCAL': '/Users/verm/prefix/bin/aclocal-1.9',
'AUTOCONF': '/Users/verm/prefix/bin/autoconf-2.61',
'AUTOHEADER': '/Users/verm/prefix/bin/autoheader-2.61',
'BIN_CONVERT': '/Users/verm/prefix/bin/convert'
}
))
########## ##########
# BUILDERS # BUILDERS
########## ##########
@ -583,6 +624,7 @@ slave_debian = ["mochi"]
slave_ubuntu = ["nori"] slave_ubuntu = ["nori"]
slave_osx = ["kokoro"] slave_osx = ["kokoro"]
slave_osx_ppc = ["mokona"] slave_osx_ppc = ["mokona"]
slave_www = ['shoyu']
Windowsx8632 = { 'name': "Windows-x86_32", 'slavenames': slave_win, 'builddir': "full_Windows-x86_32", 'factory': fwin } Windowsx8632 = { 'name': "Windows-x86_32", 'slavenames': slave_win, 'builddir': "full_Windows-x86_32", 'factory': fwin }
Windowsx8664 = { 'name': "Windows-x86_64", 'slavenames': slave_win, 'builddir': "full_Windows-x86_64", 'factory': fwin64 } Windowsx8664 = { 'name': "Windows-x86_64", 'slavenames': slave_win, 'builddir': "full_Windows-x86_64", 'factory': fwin64 }
@ -593,6 +635,7 @@ Ubuntux8664 = { 'name': "Ubuntu-x86_64", 'slavenames': slave_ubuntu, 'build
Debianx8632 = { 'name': "Debian-x86_32", 'slavenames': slave_debian, 'builddir': "full_Debian-x86_32", 'factory': flinux } Debianx8632 = { 'name': "Debian-x86_32", 'slavenames': slave_debian, 'builddir': "full_Debian-x86_32", 'factory': flinux }
UNIXDist = { 'name': "UNIX Dist", 'slavenames': slave_debian + slave_ubuntu + slave_freebsd, 'builddir': "UNIX_Dist", 'factory': funix_dist } UNIXDist = { 'name': "UNIX Dist", 'slavenames': slave_debian + slave_ubuntu + slave_freebsd, 'builddir': "UNIX_Dist", 'factory': funix_dist }
Doxygen = { 'name': "Doxygen", 'slavenames': slave_www, 'builddir': "www_Doxygen", 'factory': fwww_dox }
c['builders'] = [ c['builders'] = [
Windowsx8632, Windowsx8632,
@ -602,7 +645,8 @@ Darwinx8664,
FreeBSDx8664, FreeBSDx8664,
Ubuntux8664, Ubuntux8664,
Debianx8632, Debianx8632,
UNIXDist UNIXDist,
Doxygen
] ]
builder_name_windows = [ builder_name_windows = [
@ -621,6 +665,10 @@ builder_name_darwin = [
"Darwin-x86_64" "Darwin-x86_64"
] ]
builder_name_www = [
"Doxygen"
]
############ ############
# SCHEDULERS # SCHEDULERS
@ -646,6 +694,12 @@ full_darwin = Scheduler(name="full_darwin",
treeStableTimer=901, treeStableTimer=901,
builderNames=builder_name_darwin, builderNames=builder_name_darwin,
fileIsImportant=interested_osx) fileIsImportant=interested_osx)
full_www = Scheduler(name="full_www",
branch=None,
treeStableTimer=901,
builderNames=builder_name_www,
fileIsImportant=interested_doxygen)
unix_dist = Dependent("unix_dist", unix_dist = Dependent("unix_dist",
full_unix, full_unix,
@ -656,7 +710,7 @@ unix_dist = Dependent("unix_dist",
from buildbot.scheduler import Try_Jobdir from buildbot.scheduler import Try_Jobdir
try_job = Try_Jobdir("try", builder_name_windows + builder_name_unix + builder_name_darwin, jobdir="jobdir") try_job = Try_Jobdir("try", builder_name_windows + builder_name_unix + builder_name_darwin, jobdir="jobdir")
c['schedulers'] = [full_windows, full_unix, full_darwin, unix_dist] c['schedulers'] = [full_windows, full_unix, full_darwin, full_www, unix_dist]
from buildbot import scheduler from buildbot import scheduler