[Scummvm-cvs-logs] SF.net SVN: scummvm:[55892] buildbot/config
dhewg at users.sourceforge.net
dhewg at users.sourceforge.net
Sat Feb 12 12:34:15 CET 2011
Revision: 55892
http://scummvm.svn.sourceforge.net/scummvm/?rev=55892&view=rev
Author: dhewg
Date: 2011-02-12 11:34:15 +0000 (Sat, 12 Feb 2011)
Log Message:
-----------
BUILDBOT: update config for v0.8
Modified Paths:
--------------
buildbot/config/master.cfg
buildbot/config/scumm.py
Modified: buildbot/config/master.cfg
===================================================================
--- buildbot/config/master.cfg 2011-02-12 11:03:27 UTC (rev 55891)
+++ buildbot/config/master.cfg 2011-02-12 11:34:15 UTC (rev 55892)
@@ -8,7 +8,7 @@
#######
import os, sys, copy
-sys.path.append("/var/lib/buildbot/master")
+sys.path.append("/opt/buildbot/master")
import scumm
import scummsecret
@@ -423,13 +423,11 @@
"disttarget": "dist",
"package": [
"scummvm.elf",
- "IP.BIN",
"SCUMMVM.BIN",
"AGI.PLG",
"AGOS.PLG",
"CINE.PLG",
"CRUISE.PLG",
- "DRACI.PLG",
"DRASCULA.PLG",
"GOB.PLG",
"GROOVIE.PLG",
@@ -439,12 +437,10 @@
"PARALLACTION.PLG",
"QUEEN.PLG",
"SAGA.PLG",
- "SCI.PLG",
"SCUMM.PLG",
"SKY.PLG",
"SWORD1.PLG",
"SWORD2.PLG",
- "TEENAGENT.PLG",
"TINSEL.PLG",
"TOUCHE.PLG",
"TUCKER.PLG"
@@ -455,7 +451,10 @@
p_trunk = copy.deepcopy(p)
p_trunk["package"].extend( [
- "M4.PLG"
+ "DRACI.PLG",
+ "M4.PLG",
+ "SCI.PLG",
+ "TEENAGENT.PLG"
] )
scumm_platforms_trunk["dc"] = p_trunk
@@ -891,7 +890,7 @@
from buildbot.status.html import WebStatus
from buildbot.status.web.auth import HTPasswdAuth
-htfile = '/var/lib/buildbot/master/scumm_htpasswd'
+htfile = '/opt/buildbot/master/scumm_htpasswd'
web_auth = None
web_force = False
Modified: buildbot/config/scumm.py
===================================================================
--- buildbot/config/scumm.py 2011-02-12 11:03:27 UTC (rev 55891)
+++ buildbot/config/scumm.py 2011-02-12 11:34:15 UTC (rev 55892)
@@ -13,7 +13,6 @@
from buildbot import interfaces, util
from buildbot import version
from buildbot.sourcestamp import SourceStamp
-from buildbot.process.base import BuildRequest
from buildbot.status import base
from buildbot.status.builder import SUCCESS, WARNINGS, FAILURE, EXCEPTION, SKIPPED
from buildbot import scheduler
@@ -261,8 +260,8 @@
self.timer.reset(0)
def requestSubmitted(self, brstatus):
- self.log('BuildRequest for %s submiitted to Builder %s' %
- (brstatus.getSourceStamp(), brstatus.builderName))
+ self.log('BuildRequest for %s submitted to Builder %s' %
+ (brstatus.getSourceStamp(), brstatus.getBuilderName()))
def builderRemoved(self, builderName):
self.msg('Builder %s removed' % (builderName))
@@ -284,7 +283,11 @@
if not result in [ SUCCESS, FAILURE ]:
return
- prevResult = build.getPreviousBuild().getResults()
+ prevBuild = build.getPreviousBuild()
+ if not prevBuild:
+ return
+
+ prevResult = prevBuild.getResults()
if not prevResult in [ SUCCESS, FAILURE ]:
return
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list