mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

* Update OS versions for the buildslaves.

Browse source 
* Fix builders for the new build system.

Originally committed to SVN as r5225.
This commit is contained in:
Amar Takhar 2011-01-17 00:25:09 +00:00
parent 7713ea20e0
commit fe06b43354
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
devel/tinderbox/buildbot/master/master.cfg
View file

@ -109,13 +109,13 @@ def interested_doxygen(change):
from buildbot.buildslave import BuildSlave from buildbot.buildslave import BuildSlave
c['slaves'] = [ c['slaves'] = [
BuildSlave("mochi", passwd['mochi'], max_builds=1, properties={'os':'Debian', 'version':'5.0.1', 'osname':'Lenny'}), BuildSlave("mochi", passwd['mochi'], max_builds=1, properties={'os':'Debian', 'version':'5.0.1', 'osname':'Squeeze'}),
BuildSlave("kokoro", passwd['kokoro'], max_builds=1, properties={'os':'OSX', 'version':'10.5.6', 'osname':'Leopard'}), BuildSlave("kokoro", passwd['kokoro'], max_builds=1, properties={'os':'OSX', 'version':'10.6.3', 'osname':'Snow Leopard'}),
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':'9.0', 'osname':'CURRENT'}),
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':'10.10', 'osname':'Maverick'}),
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':'???'}) BuildSlave("shoyu", passwd['shoyu'], max_builds=2, properties={'os':'FreeBSD', 'version': '???', 'osname':'???'})
] ]
@ -208,12 +208,10 @@ ffbsd.addStep(shell.ShellCommand(
command=["./autogen.sh", "--skip-configure"], command=["./autogen.sh", "--skip-configure"],
env={ env={
'ACLOCAL_FLAGS': '-I /usr/local/share/aclocal -I /usr/home/verm/build/wx/share/aclocal', 'ACLOCAL_FLAGS': '-I /usr/local/share/aclocal -I /home/verm/build/wx/share/aclocal',
'ACLOCAL': 'aclocal-1.10', 'ACLOCAL': 'aclocal-1.11',
'AUTOCONF': 'autoconf-2.62', 'AUTOCONF': 'autoconf-2.68',
'AUTOHEADER': 'autoheader-2.62', 'AUTOHEADER': 'autoheader-2.68'
'AUTOMAKE': 'automake-1.10',
'LIBTOOLIZE': 'libtoolize'
} }
)) ))
@ -233,9 +231,9 @@ ffbsd.addStep(shell.ShellCommand(
'CXX': '/usr/local/libexec/ccache/g++', 'CXX': '/usr/local/libexec/ccache/g++',
'CFLAGS': '-I/usr/local/include', 'CFLAGS': '-I/usr/local/include',
'CXXFLAGS': '-I/usr/local/include', 'CXXFLAGS': '-I/usr/local/include',
'LDFLAGS': '-L/usr/local/lib -rpath /usr/home/verm/build/wx/lib', 'LDFLAGS': '-rpath /usr/home/verm/build/wx/lib',
'LUA_CFLAGS': '-I/usr/local/include/lua51', # 'LUA_CFLAGS': '-I/usr/local/include/lua51',
'LUA_LDFLAGS': '-L/usr/local/lib -llua-5.1' # 'LUA_LDFLAGS': '-L/usr/local/lib -llua-5.1'
}, },
name = "configure", name = "configure",
description = ["configuring"], description = ["configuring"],