mirror of https://github.com/odrling/Aegisub
Remove PPC builder and comment some old code that needs to be re-done for the latest verison of buildbot (0.8)
Originally committed to SVN as r5092.
This commit is contained in:
Amar Takhar
parent
efe88823c7
commit
08750b94e8
|
|
@ -3,13 +3,16 @@
|
|||
###############
|
||||
c = BuildmasterConfig = {}
|
||||
|
||||
c['db_url'] = "mysql://buildbot:b33r@localhost/buildbot?max_idle=300"
|
||||
|
||||
|
||||
# Import our passwords
|
||||
passwd_file = open('passwd.py')
|
||||
exec passwd_file
|
||||
passwd_file.close()
|
||||
|
||||
# What port to listen on, used for try attempts as well.
|
||||
c['slavePortnum'] = 9899
|
||||
c['slavePortnum'] = "tcp:9899:interface=68.233.14.102"
|
||||
|
||||
c['projectName'] = "Aegisub"
|
||||
c['projectURL'] = "http://devel.aegisub.org/"
|
||||
|
|
@ -125,7 +128,7 @@ from buildbot.steps.shell import Configure, Compile, WithProperties
|
|||
from buildbot.process import factory
|
||||
from buildbot import locks
|
||||
from agi_upload import agi_upload
|
||||
from OOCompile import OOCompile
|
||||
#from OOCompile import OOCompile
|
||||
|
||||
# General settings
|
||||
source_unix = "http://svn.aegisub.org/trunk/aegisub/"
|
||||
|
|
@ -177,7 +180,7 @@ flinux.addStep(shell.ShellCommand(
|
|||
haltOnFailure=True
|
||||
))
|
||||
|
||||
flinux.addStep(OOCompile(
|
||||
flinux.addStep(Compile(
|
||||
command=["make"],
|
||||
env={
|
||||
'CCACHE_PATH': '/usr/bin',
|
||||
|
|
@ -244,7 +247,7 @@ ffbsd.addStep(shell.ShellCommand(
|
|||
haltOnFailure=True
|
||||
))
|
||||
|
||||
ffbsd.addStep(OOCompile(
|
||||
ffbsd.addStep(Compile(
|
||||
command=["gmake"],
|
||||
name = "build",
|
||||
description = ["building"],
|
||||
|
|
@ -278,17 +281,17 @@ funix_dist.addStep(shell.ShellCommand(
|
|||
haltOnFailure=True
|
||||
))
|
||||
|
||||
funix_dist.addStep(agi_upload(
|
||||
blocksize=640*1024,
|
||||
slavesrc="dist.tar.bz2",
|
||||
mode=0644,
|
||||
masterdest=WithProperties("tinderbox/snapshot/aegisub-snap-r%s.tar.bz2", "got_revision")),
|
||||
name = "upload",
|
||||
description = ["uploading"],
|
||||
descriptionDone = ["uploaded"],
|
||||
haltOnFailure=False,
|
||||
flunkOnFailure=False
|
||||
)
|
||||
#funix_dist.addStep(agi_upload(
|
||||
# blocksize=640*1024,
|
||||
# slavesrc="dist.tar.bz2",
|
||||
# mode=0644,
|
||||
# masterdest=WithProperties("tinderbox/snapshot/aegisub-snap-r%s.tar.bz2", "got_revision"),
|
||||
# name = "upload",
|
||||
# description = ["uploading"],
|
||||
# descriptionDone = ["uploaded"],
|
||||
# haltOnFailure=False,
|
||||
# flunkOnFailure=False
|
||||
#))
|
||||
|
||||
|
||||
############
|
||||
|
|
@ -351,7 +354,7 @@ fosx.addStep(shell.ShellCommand(
|
|||
haltOnFailure=True
|
||||
))
|
||||
|
||||
fosx.addStep(OOCompile(
|
||||
fosx.addStep(Compile(
|
||||
command=["make"],
|
||||
name = "build",
|
||||
description = ["building"],
|
||||
|
|
@ -386,126 +389,17 @@ fosx.addStep(shell.ShellCommand(
|
|||
haltOnFailure=True
|
||||
))
|
||||
|
||||
fosx.addStep(agi_upload(
|
||||
blocksize=640*1024,
|
||||
slavesrc="bundle.dmg",
|
||||
mode=0644,
|
||||
masterdest=WithProperties("tinderbox/osx/aegisub-%s-%s-%s-r%s.dmg", "buildername", "slavename", "buildnumber", "got_revision")),
|
||||
name = "upload",
|
||||
description = ["uploading"],
|
||||
descriptionDone = ["uploaded"],
|
||||
haltOnFailure=False,
|
||||
flunkOnFailure=False
|
||||
)
|
||||
|
||||
|
||||
##########
|
||||
# Factory
|
||||
# OS X PPC
|
||||
##########
|
||||
fosx_ppc = factory.BuildFactory()
|
||||
fosx_ppc.addStep(source.SVN(mode="clobber", svnurl=source_unix))
|
||||
|
||||
fosx_ppc.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.10',
|
||||
'ACLOCAL': '/Users/verm/prefix/bin/aclocal-1.10',
|
||||
'AUTOCONF': '/Users/verm/prefix/bin/autoconf-2.61',
|
||||
'AUTOHEADER': '/Users/verm/prefix/bin/autoheader-2.61',
|
||||
'BIN_CONVERT': '/Users/verm/prefix/bin/convert'
|
||||
}
|
||||
))
|
||||
|
||||
fosx_ppc.addStep(shell.ShellCommand(
|
||||
command=["./configure",
|
||||
"--prefix=/Users/verm/prefix",
|
||||
WithProperties("--with-build-credit=BuildBot: %s (%s)", "buildername", "slavename"),
|
||||
"--with-apple-opengl-framework",
|
||||
"--with-wx-config=/Users/verm/prefix/bin/wx-config",
|
||||
"--enable-debug"
|
||||
"--prefix=/Users/verm/i",
|
||||
"--disable-check-wx-opengl",
|
||||
"--disable-check-wx-stc",
|
||||
],
|
||||
env={
|
||||
'CCACHE_PATH': '/usr/bin',
|
||||
'CCACHE_DIR': '/Users/verm/.ccache',
|
||||
'CC': '/opt/local/libexec/ccache/gcc',
|
||||
'CXX': '/opt/local/libexec/ccache/g++',
|
||||
'PKG_CONFIG': '/Users/verm/prefix/bin/pkg-config',
|
||||
'PKG_CONFIG_PATH': '/Users/verm/prefix/lib/pkgconfig',
|
||||
'CXXFLAGS': '-I/Users/verm/prefix/include',
|
||||
'LDFLAGS': '-L/Users/verm/prefix/lib -Wl,-rpath=/Users/verm/prefix/lib',
|
||||
'LUA_CFLAGS': '-I/Users/verm/prefix/include/lua51',
|
||||
'LUA_LDFLAGS': '-L/Users/verm/prefix/lib/lua51 -llua',
|
||||
'OPENAL_CFLAGS': '-framework OpenAL',
|
||||
'OPENAL_LIBS': '-framework OpenAL',
|
||||
'CFLAGS': '-I/Developer/SDKs/MacOSX10.5.sdk/usr/include',
|
||||
'ICONV_LDFLAGS': '/usr/lib/libiconv.dylib',
|
||||
},
|
||||
name = "configure",
|
||||
description = ["configuring"],
|
||||
descriptionDone = ["configure"],
|
||||
logfiles={
|
||||
'config.log': 'config.log',
|
||||
'config.status': 'config.status'
|
||||
},
|
||||
haltOnFailure=True
|
||||
))
|
||||
|
||||
fosx_ppc.addStep(OOCompile(
|
||||
command=["make"],
|
||||
name = "build",
|
||||
env={
|
||||
'CCACHE_PATH': '/usr/bin',
|
||||
'CCACHE_DIR': '/Users/verm/.ccache'
|
||||
},
|
||||
description = ["building"],
|
||||
descriptionDone = ["build"],
|
||||
haltOnFailure=True
|
||||
))
|
||||
|
||||
|
||||
fosx_ppc.addStep(shell.ShellCommand(
|
||||
command=["make", "osx-tinderbox-bundle"],
|
||||
env={
|
||||
'T_BUNDLE': WithProperties("aegisub-%s-%s-%s-r%s", "buildername", "slavename", "buildnumber", "got_revision"),
|
||||
},
|
||||
name = "bundle",
|
||||
description = ["bundling"],
|
||||
descriptionDone = ["bundle"],
|
||||
haltOnFailure=True
|
||||
))
|
||||
|
||||
fosx_ppc.addStep(shell.ShellCommand(
|
||||
command=["make", "osx-tinderbox-dmg"],
|
||||
env={
|
||||
'T_BUNDLE': WithProperties("aegisub-%s-%s-%s-r%s", "buildername", "slavename", "buildnumber", "got_revision"),
|
||||
'T_DMG': WithProperties("aegisub-%s-%s-%s-r%s", "buildername", "slavename", "buildnumber", "got_revision"),
|
||||
},
|
||||
name = "dmg",
|
||||
description = ["dmging"],
|
||||
descriptionDone = ["dmg"],
|
||||
haltOnFailure=True
|
||||
))
|
||||
|
||||
fosx_ppc.addStep(agi_upload(
|
||||
blocksize=640*1024,
|
||||
slavesrc="bundle.dmg",
|
||||
mode=0644,
|
||||
masterdest=WithProperties("tinderbox/osx/aegisub-%s-%s-%s-r%s.dmg", "buildername", "slavename", "buildnumber", "got_revision")),
|
||||
name = "upload",
|
||||
description = ["uploading"],
|
||||
descriptionDone = ["uploaded"],
|
||||
haltOnFailure=False,
|
||||
flunkOnFailure=False
|
||||
)
|
||||
#fosx.addStep(agi_upload(
|
||||
# blocksize=640*1024,
|
||||
# slavesrc="bundle.dmg",
|
||||
# mode=0644,
|
||||
# masterdest=WithProperties("tinderbox/osx/aegisub-%s-%s-%s-r%s.dmg", "buildername", "slavename", "buildnumber", "got_revision")),
|
||||
# name = "upload",
|
||||
# description = ["uploading"],
|
||||
# descriptionDone = ["uploaded"],
|
||||
# haltOnFailure=False,
|
||||
# flunkOnFailure=False
|
||||
#)
|
||||
|
||||
|
||||
#########
|
||||
|
|
@ -523,7 +417,7 @@ fwin.addStep(shell.ShellCommand(
|
|||
haltOnFailure=True
|
||||
))
|
||||
|
||||
fwin.addStep(OOCompile(
|
||||
fwin.addStep(Compile(
|
||||
command=["aegisub\\tinderbox\\windows\\anpan.bat", "Release", "Win32"],
|
||||
name = "build",
|
||||
description = ["building"],
|
||||
|
|
@ -539,17 +433,17 @@ fwin.addStep(shell.ShellCommand(
|
|||
haltOnFailure=True
|
||||
))
|
||||
|
||||
fwin.addStep(agi_upload(
|
||||
blocksize=640*1024,
|
||||
slavesrc="dist.7z",
|
||||
mode=0644,
|
||||
masterdest=WithProperties("tinderbox/windows/aegisub-%s-%s-%s-r%s.7z", "buildername", "slavename", "buildnumber", "got_revision")),
|
||||
name = "upload",
|
||||
description = ["uploading"],
|
||||
descriptionDone = ["uploaded"],
|
||||
haltOnFailure=False,
|
||||
flunkOnFailure=False
|
||||
)
|
||||
#fwin.addStep(agi_upload(
|
||||
# blocksize=640*1024,
|
||||
# slavesrc="dist.7z",
|
||||
# mode=0644,
|
||||
# masterdest=WithProperties("tinderbox/windows/aegisub-%s-%s-%s-r%s.7z", "buildername", "slavename", "buildnumber", "got_revision")),
|
||||
# name = "upload",
|
||||
# description = ["uploading"],
|
||||
# descriptionDone = ["uploaded"],
|
||||
# haltOnFailure=False,
|
||||
# flunkOnFailure=False
|
||||
#)
|
||||
|
||||
|
||||
fwin64 = factory.BuildFactory()
|
||||
|
|
@ -563,7 +457,7 @@ fwin64.addStep(shell.ShellCommand(
|
|||
haltOnFailure=True
|
||||
))
|
||||
|
||||
fwin64.addStep(OOCompile(
|
||||
fwin64.addStep(Compile(
|
||||
name = "build",
|
||||
command=["aegisub\\tinderbox\\windows\\anpan.bat", "Release", "x64"],
|
||||
description = ["building"],
|
||||
|
|
@ -579,17 +473,17 @@ fwin64.addStep(shell.ShellCommand(
|
|||
haltOnFailure=True
|
||||
))
|
||||
|
||||
fwin64.addStep(agi_upload(
|
||||
blocksize=640*1024,
|
||||
slavesrc="dist.7z",
|
||||
mode=0644,
|
||||
masterdest=WithProperties("tinderbox/windows/aegisub-%s-%s-%s-r%s.7z", "buildername", "slavename", "buildnumber", "got_revision")),
|
||||
name = "upload",
|
||||
description = ["uploading"],
|
||||
descriptionDone = ["uploaded"],
|
||||
haltOnFailure=False,
|
||||
flunkOnFailure=False
|
||||
)
|
||||
#fwin64.addStep(agi_upload(
|
||||
# blocksize=640*1024,
|
||||
# slavesrc="dist.7z",
|
||||
# mode=0644,
|
||||
# masterdest=WithProperties("tinderbox/windows/aegisub-%s-%s-%s-r%s.7z", "buildername", "slavename", "buildnumber", "got_revision")),
|
||||
# name = "upload",
|
||||
# description = ["uploading"],
|
||||
# descriptionDone = ["uploaded"],
|
||||
# haltOnFailure=False,
|
||||
# flunkOnFailure=False
|
||||
#)
|
||||
|
||||
|
||||
#########
|
||||
|
|
@ -616,6 +510,22 @@ fwww_dox.addStep(shell.ShellCommand(
|
|||
haltOnFailure=True
|
||||
))
|
||||
|
||||
fwww_dox.addStep(shell.ShellCommand(
|
||||
name = "libaegisub",
|
||||
description = "generating",
|
||||
descriptionDone = "libaegisub",
|
||||
logfiles={
|
||||
'doxygen.log': 'doxygen.log'
|
||||
},
|
||||
command=[
|
||||
"sh",
|
||||
"-x",
|
||||
"tinderbox/www/doxygen.sh",
|
||||
"libaegisub"
|
||||
],
|
||||
haltOnFailure=True
|
||||
))
|
||||
|
||||
fwww_dox.addStep(shell.ShellCommand(
|
||||
name = "reporter",
|
||||
description = "generating",
|
||||
|
|
@ -642,12 +552,10 @@ slave_freebsd = ["tako"]
|
|||
slave_debian = ["mochi"]
|
||||
slave_ubuntu = ["nori"]
|
||||
slave_osx = ["kokoro"]
|
||||
slave_osx_ppc = ["mokona"]
|
||||
slave_www = ['shoyu']
|
||||
|
||||
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 }
|
||||
DarwinPPC = { 'name': "Darwin-PPC", 'slavenames': slave_osx_ppc, 'builddir': "full_Darwin-PPC", 'factory': fosx_ppc }
|
||||
Darwinx8664 = { 'name': "Darwin-x86_64", 'slavenames': slave_osx, 'builddir': "full_Darwin-x86_64", 'factory': fosx }
|
||||
FreeBSDx8664 = { 'name': "FreeBSD-x86_64", 'slavenames': slave_freebsd, 'builddir': "full_FreeBSD-x86_64", 'factory': ffbsd }
|
||||
Ubuntux8664 = { 'name': "Ubuntu-x86_64", 'slavenames': slave_ubuntu, 'builddir': "full_Ubuntu-x86_64", 'factory': flinux }
|
||||
|
|
@ -659,7 +567,6 @@ Doxygen = { 'name': "Doxygen", 'slavenames': slave_www, 'builddir': "www_Dox
|
|||
c['builders'] = [
|
||||
Windowsx8632,
|
||||
Windowsx8664,
|
||||
DarwinPPC,
|
||||
Darwinx8664,
|
||||
FreeBSDx8664,
|
||||
Ubuntux8664,
|
||||
|
|
@ -680,7 +587,6 @@ builder_name_unix = [
|
|||
]
|
||||
|
||||
builder_name_darwin = [
|
||||
"Darwin-PPC",
|
||||
"Darwin-x86_64"
|
||||
]
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue