[Scummvm-cvs-logs] SF.net SVN: scummvm:[55895] buildbot/config
dhewg at users.sourceforge.net
dhewg at users.sourceforge.net
Sat Feb 12 16:34:10 CET 2011
Revision: 55895
http://scummvm.svn.sourceforge.net/scummvm/?rev=55895&view=rev
Author: dhewg
Date: 2011-02-12 15:34:09 +0000 (Sat, 12 Feb 2011)
Log Message:
-----------
BUILDBOT: switch to github.
Modified Paths:
--------------
buildbot/config/master.cfg
buildbot/config/scumm.py
Modified: buildbot/config/master.cfg
===================================================================
--- buildbot/config/master.cfg 2011-02-12 14:37:59 UTC (rev 55894)
+++ buildbot/config/master.cfg 2011-02-12 15:34:09 UTC (rev 55895)
@@ -12,29 +12,19 @@
import scumm
import scummsecret
-# Toggles a few things, only meant for debugging and local testing.
+scumm_giturl = "git://github.com/scummvm/scummvm.git"
-# fake commits via the shell command:
-# trunk: buildbot sendchange --master localhost:9989 --revision_number 48939 --username testuser base/nonexistant.cpp
-# branch: buildbot sendchange --master localhost:9989 --branch branches/branch-1-1-0 --revision_number 48939 --username testuser base/nonexistant.cpp
+scumm_branch_master = "master"
+scumm_branch_master_desc = "master"
+# TODO
+scumm_branch_stable = "nonexistantyet"
+scumm_branch_stable_desc = "stable"
-scumm_testenv = False
+scumm_package_dst_master = "/var/www/snapshots/master"
+scumm_package_dst_stable = "/var/www/snapshots/stable"
-scumm_svnroot = "https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/"
-scumm_revlink = "https://sourceforge.net/apps/trac/scummvm/changeset/%s"
-
-scumm_branch = "branches/branch-1-2-0"
-scumm_branch_desc = "1.2.0"
-
-if scumm_testenv:
- scumm_package_dst_trunk = "/tmp"
- scumm_package_dst_branch = "/tmp"
-else:
- scumm_package_dst_trunk = "/var/www/snapshots/trunk"
- scumm_package_dst_branch = "/var/www/snapshots/1.2.0"
-
-# Files to package for branch snapshots (common to all ports).
-scumm_package_branch = [
+# Files to package for stable snapshots (common to all ports).
+scumm_package_stable = [
"AUTHORS",
"COPYING",
"COPYING.LGPL",
@@ -52,9 +42,9 @@
"dists/pred.dic"
]
-# Files to package for trunk snapshots (common to all ports).
-scumm_package_trunk = copy.deepcopy(scumm_package_branch)
-scumm_package_trunk.extend( [
+# Files to package for master snapshots (common to all ports).
+scumm_package_master = copy.deepcopy(scumm_package_stable)
+scumm_package_master.extend( [
"COPYING.BSD",
"gui/themes/translations.dat",
"dists/engine-data/hugo.dat"
@@ -70,8 +60,8 @@
# Our platform definitions.
-scumm_platforms_trunk = {}
-scumm_platforms_branch = {}
+scumm_platforms_master = {}
+scumm_platforms_stable = {}
# debian lenny 32bit.
scumm_env_lenny = copy.deepcopy(scumm_env)
@@ -83,8 +73,8 @@
"package": [ "scummvm" ]
}
-scumm_platforms_trunk["lenny"] = p
-scumm_platforms_branch["lenny"] = p
+scumm_platforms_master["lenny"] = p
+scumm_platforms_stable["lenny"] = p
# debian lenny 64bit.
scumm_root_lenny_x86_64 = "/opt/toolchains/debian-lenny-x86_64"
@@ -103,8 +93,8 @@
"package": [ "scummvm" ]
}
-scumm_platforms_trunk["lenny-x86_64"] = p
-scumm_platforms_branch["lenny-x86_64"] = p
+scumm_platforms_master["lenny-x86_64"] = p
+scumm_platforms_stable["lenny-x86_64"] = p
# mingw 32bit, using the mingw compiler from the debian repositories.
scumm_root_mingw_w32 = "/opt/toolchains/i586-mingw32msvc"
@@ -125,8 +115,8 @@
]
}
-scumm_platforms_trunk["mingw-w32"] = p
-scumm_platforms_branch["mingw-w32"] = p
+scumm_platforms_master["mingw-w32"] = p
+scumm_platforms_stable["mingw-w32"] = p
# mingw 64bit, using an experimental snapshot of mingw-w64.
scumm_root_mingw_w64 = "/opt/toolchains/mingw-w64-bin_i686-linux"
@@ -148,8 +138,8 @@
]
}
-scumm_platforms_trunk["mingw-w64"] = p
-scumm_platforms_branch["mingw-w64"] = p
+scumm_platforms_master["mingw-w64"] = p
+scumm_platforms_stable["mingw-w64"] = p
# wii
scumm_root_wii = "/opt/toolchains/devkitPPC-r16"
@@ -171,8 +161,8 @@
"package": [ "wiidist/scummvm" ]
}
-scumm_platforms_trunk["wii"] = p
-scumm_platforms_branch["wii"] = p
+scumm_platforms_master["wii"] = p
+scumm_platforms_stable["wii"] = p
# gamecube
scumm_root_gc = "/opt/toolchains/devkitPPC-r16"
@@ -194,8 +184,8 @@
"package": [ "wiidist/scummvm" ]
}
-scumm_platforms_trunk["gamecube"] = p
-scumm_platforms_branch["gamecube"] = p
+scumm_platforms_master["gamecube"] = p
+scumm_platforms_stable["gamecube"] = p
# Nintendo DS
scumm_root_ds = "/opt/toolchains/devkitARM-r30"
@@ -225,8 +215,8 @@
]
}
-scumm_platforms_trunk["ds"] = p
-scumm_platforms_branch["ds"] = p
+scumm_platforms_master["ds"] = p
+scumm_platforms_stable["ds"] = p
# Mac OS X Intel
scumm_root_osx_intel = "/opt/toolchains/i686-apple-darwin9-10.4"
@@ -247,8 +237,8 @@
"package": [ "ScummVM.app" ]
}
-scumm_platforms_trunk["osx_intel"] = p
-scumm_platforms_branch["osx_intel"] = p
+scumm_platforms_master["osx_intel"] = p
+scumm_platforms_stable["osx_intel"] = p
# Mac OS X PPC
scumm_root_osx_ppc = "/opt/toolchains/powerpc-apple-darwin8-10.2"
@@ -269,8 +259,8 @@
"package": [ "ScummVM.app" ]
}
-scumm_platforms_trunk["osx_ppc"] = p
-scumm_platforms_branch["osx_ppc"] = p
+scumm_platforms_master["osx_ppc"] = p
+scumm_platforms_stable["osx_ppc"] = p
# iPhone
scumm_root_iphone = "/opt/toolchains/arm-apple-darwin9-llvm-gcc-4.2"
@@ -293,8 +283,8 @@
"package": [ "ScummVM.app" ]
}
-scumm_platforms_trunk["iphone"] = p
-scumm_platforms_branch["iphone"] = p
+scumm_platforms_master["iphone"] = p
+scumm_platforms_stable["iphone"] = p
# PSP
scumm_root_psp = "/opt/toolchains/psp"
@@ -319,17 +309,17 @@
]
}
-p_trunk = copy.deepcopy(p) # copy for trunk
+p_master = copy.deepcopy(p) # copy for master
p["package"].extend( [
- "../../src-branch/src/backends/platform/psp/kbd.zip"
+ "../../src-stable/src/backends/platform/psp/kbd.zip"
] )
-p_trunk["package"].extend( [
- "../../src-trunk/src/backends/platform/psp/kbd.zip"
+p_master["package"].extend( [
+ "../../src-master/src/backends/platform/psp/kbd.zip"
] )
-scumm_platforms_branch["psp"] = p
-scumm_platforms_trunk["psp"] = p_trunk
+scumm_platforms_stable["psp"] = p
+scumm_platforms_master["psp"] = p_master
# PS2
scumm_root_ps2 = "/opt/toolchains/ps2"
@@ -356,8 +346,8 @@
"package": [ "scummvm.elf" ] # TODO/FIXME: What to package?
}
-scumm_platforms_trunk["ps2"] = p
-scumm_platforms_branch["ps2"] = p
+scumm_platforms_master["ps2"] = p
+scumm_platforms_stable["ps2"] = p
# GP2X
scumm_root_gp2x = "/opt/toolchains/open2x-gcc-4.1.1"
@@ -377,8 +367,8 @@
"package": [ "release/scummvm-gp2x.tar.bz2" ]
}
-scumm_platforms_trunk["gp2x"] = p
-scumm_platforms_branch["gp2x"] = p
+scumm_platforms_master["gp2x"] = p
+scumm_platforms_stable["gp2x"] = p
# GP2X Wiz
scumm_root_gp2xwiz = "/opt/toolchains/open2x-gcc-4.1.1"
@@ -400,8 +390,8 @@
"package": [ "release/scummvm-gp2xwiz.tar.bz2" ]
}
-scumm_platforms_trunk["gp2xwiz"] = p
-scumm_platforms_branch["gp2xwiz"] = p
+scumm_platforms_master["gp2xwiz"] = p
+scumm_platforms_stable["gp2xwiz"] = p
# DC
scumm_root_dc= "/opt/toolchains/dc"
@@ -447,17 +437,17 @@
]
}
-scumm_platforms_branch["dc"] = p
+scumm_platforms_stable["dc"] = p
-p_trunk = copy.deepcopy(p)
-p_trunk["package"].extend( [
+p_master = copy.deepcopy(p)
+p_master["package"].extend( [
"DRACI.PLG",
"M4.PLG",
"SCI.PLG",
"TEENAGENT.PLG"
] )
-scumm_platforms_trunk["dc"] = p_trunk
+scumm_platforms_master["dc"] = p_master
# windows ce
scumm_root_wince = "/opt/toolchains/mingw32ce-0.5.1"
@@ -476,8 +466,8 @@
"package": [ "scummvm.exe" ]
}
-scumm_platforms_trunk["wince"] = p
-scumm_platforms_branch["wince"] = p
+scumm_platforms_master["wince"] = p
+scumm_platforms_stable["wince"] = p
# motoezx
scumm_root_motoezx = "/opt/toolchains/motoezx"
@@ -497,8 +487,8 @@
"package": [ "release/ScummVM-motoezx.pkg" ]
}
-scumm_platforms_trunk["motoezx"] = p
-scumm_platforms_branch["motoezx"] = p
+scumm_platforms_master["motoezx"] = p
+scumm_platforms_stable["motoezx"] = p
# motomagx
scumm_root_motomagx = "/opt/toolchains/motomagx/arm-eabi2"
@@ -518,8 +508,8 @@
"package": [ "release/ScummVM-motomagx.mpkg" ]
}
-scumm_platforms_trunk["motomagx"] = p
-scumm_platforms_branch["motomagx"] = p
+scumm_platforms_master["motomagx"] = p
+scumm_platforms_stable["motomagx"] = p
# n64
scumm_root_n64 = "/opt/toolchains/mips64-n64"
@@ -541,8 +531,8 @@
"package": [ "scummvm.elf" ]
}
-scumm_platforms_trunk["n64"] = p
-scumm_platforms_branch["n64"] = p
+scumm_platforms_master["n64"] = p
+scumm_platforms_stable["n64"] = p
# dingux
scumm_root_dingux = "/opt/toolchains/dingux-mipsel"
@@ -564,8 +554,8 @@
]
}
-scumm_platforms_trunk["dingux"] = p
-scumm_platforms_branch["dingux"] = p
+scumm_platforms_master["dingux"] = p
+scumm_platforms_stable["dingux"] = p
# OpenPandora
@@ -587,8 +577,8 @@
# "package": [ "release/scummvm-op-pnd.tar.bz2" ]
#}
-#scumm_platforms_trunk["op"] = p
-#scumm_platforms_branch["op"] = p
+#scumm_platforms_master["op"] = p
+#scumm_platforms_stable["op"] = p
# GPH Caanoo
# SDK_PATH and TARGET_SYS are exported as they are used in the platforms SDL_CONFIG.
@@ -615,8 +605,8 @@
"package": [ "release/scummvm-caanoo.tar.bz2" ]
}
-scumm_platforms_trunk["caanoo"] = p
-scumm_platforms_branch["caanoo"] = p
+scumm_platforms_master["caanoo"] = p
+scumm_platforms_stable["caanoo"] = p
#######
####### buildbot setup
@@ -635,109 +625,92 @@
c["slaves"] = [ BuildSlave("localslave", scummsecret.pwd_localslave) ]
c["slavePortnum"] = "tcp:9989:interface=127.0.0.1"
-####### CHANGESOURCES
-
-# Poll for new revisions in SVN.
-# Trunk and one branch are taken into account.
-
-from buildbot.changes.svnpoller import SVNPoller, split_file_branches
-from buildbot.changes.pb import PBChangeSource
-
-if scumm_testenv:
- c["change_source"] = PBChangeSource()
-else:
- c["change_source"] = SVNPoller(scumm_svnroot,
- split_file = split_file_branches,
- pollinterval = 3 * 60,
- revlinktmpl = scumm_revlink)
-
####### SCHEDULERS
-# Only fetch changes from SVN, these checkouts are used by all compile runs.
+# Only fetch changes, these checkouts are used by all compile runs.
from buildbot.scheduler import Scheduler, Nightly, Triggerable
-s_trunk = Scheduler(name = "fetch-trunk",
- branch = None,
+s_master = Scheduler(name = "fetch-master",
+ branch = scumm_branch_master,
treeStableTimer = 5,
- builderNames = [ "fetch-trunk" ])
+ builderNames = [ "fetch-master" ])
-s_branch = Scheduler(name = "fetch-branch",
- branch = scumm_branch,
+s_stable = Scheduler(name = "fetch-branch",
+ branch = scumm_branch_stable,
treeStableTimer = 5,
- builderNames = [ "fetch-branch" ])
+ builderNames = [ "fetch-stable" ])
# The building schedulers, starting the associated builders
-builders_trunk = []
-for i in scumm_platforms_trunk.keys():
- builders_trunk.append("trunk-%s" % i)
+builders_master = []
+for i in scumm_platforms_master.keys():
+ builders_master.append("master-%s" % i)
-s_build_trunk = Triggerable(name = "trunk", builderNames = builders_trunk)
+s_build_master = Triggerable(name = "master", builderNames = builders_master)
-builders_branch = []
-for i in scumm_platforms_branch.keys():
- builders_branch.append("branch-%s" % i)
+builders_stable = []
+for i in scumm_platforms_stable.keys():
+ builders_stable.append("stable-%s" % i)
-s_build_branch = Triggerable(name = "branch", builderNames = builders_branch)
+s_build_stable = Triggerable(name = "stable", builderNames = builders_stable)
# The nightly schedulers.
-s_nightly_trunk = Nightly(name = "nightly_trunk",
- branch = None,
- builderNames = [ "nightly-trunk" ],
+s_nightly_master = Nightly(name = "nightly_master",
+ branch = scumm_branch_master,
+ builderNames = [ "nightly-master" ],
hour = 4,
minute = 0,
onlyIfChanged = True)
-s_nightly_branch = Nightly(name = "nightly_branch",
- branch = scumm_branch,
- builderNames = [ "nightly-branch" ],
+s_nightly_stable = Nightly(name = "nightly_stable",
+ branch = scumm_branch_stable,
+ builderNames = [ "nightly-stable" ],
hour = 5,
minute = 0,
onlyIfChanged = True)
c["schedulers"] = [
- s_trunk,
- s_branch,
- s_build_trunk,
- s_build_branch,
- s_nightly_trunk,
- s_nightly_branch,
+ s_master,
+ s_stable,
+ s_build_master,
+ s_build_stable,
+ s_nightly_master,
+ s_nightly_stable
]
####### BUILDERS
from buildbot.process import factory
from buildbot.process.properties import WithProperties
-from buildbot.steps.source import SVN
+from buildbot.steps.source import Git
from buildbot.steps.trigger import Trigger
from buildbot.steps.shell import Compile
# One lock to rule them all.
-# Used to prevent SVN updates when the nightly schedulers are busy.
+# Used to prevent source updates when the nightly schedulers are busy.
from buildbot.locks import MasterLock, SlaveLock
lock_src = MasterLock("source")
lock_bot = SlaveLock("slave", maxCount = 1)
-# The SVN fetching builders
+# The source fetching builders
c["builders"] = []
f = factory.BuildFactory()
f.useProgress = False
-f.addStep(SVN(mode = "update",
+f.addStep(Git(mode = "update",
workdir = "src",
- baseURL = scumm_svnroot,
- defaultBranch = "trunk",
- always_purge = True))
-f.addStep(Trigger(schedulerNames = [ "trunk" ],
+ repourl = scumm_giturl,
+ branch = scumm_branch_master))
+f.addStep(Trigger(schedulerNames = [ "master" ],
updateSourceStamp = True,
waitForFinish = True))
c["builders"].append( {
- "name": "fetch-trunk",
+ "name": "fetch-master",
"slavename": "localslave",
- "builddir": "src-trunk",
+ "builddir": "src-master",
"factory": f,
"category": "fetch",
"locks": [ lock_src.access("exclusive") ]
@@ -745,19 +718,18 @@
f = factory.BuildFactory()
f.useProgress = False
-f.addStep(SVN(mode = "update",
+f.addStep(Git(mode = "update",
workdir = "src",
- baseURL = scumm_svnroot,
- defaultBranch = scumm_branch,
- always_purge = True))
-f.addStep(Trigger(schedulerNames = [ "branch" ],
+ repourl = scumm_giturl,
+ branch = scumm_branch_stable))
+f.addStep(Trigger(schedulerNames = [ "stable" ],
updateSourceStamp = True,
waitForFinish = True))
c["builders"].append( {
- "name": "fetch-branch",
+ "name": "fetch-stable",
"slavename": "localslave",
- "builddir": "src-branch",
+ "builddir": "src-stable",
"factory": f,
"category": "fetch",
"locks": [ lock_src.access("exclusive") ]
@@ -766,32 +738,32 @@
# Nightly builders
f = factory.BuildFactory()
-f.addStep(scumm.Clean(prefix = "trunk"))
-f.addStep(Trigger(schedulerNames = [ "trunk" ],
+f.addStep(scumm.Clean(prefix = "master"))
+f.addStep(Trigger(schedulerNames = [ "master" ],
updateSourceStamp = True,
waitForFinish = True,
set_properties = { "package": True }))
c["builders"].append( {
- "name": "nightly-trunk",
+ "name": "nightly-master",
"slavename": "localslave",
- "builddir": "nightly-trunk",
+ "builddir": "nightly-master",
"factory": f,
"category": "nightly",
"locks": [ lock_src.access("exclusive") ]
})
f = factory.BuildFactory()
-f.addStep(scumm.Clean(prefix = "branch"))
-f.addStep(Trigger(schedulerNames = [ "branch" ],
+f.addStep(scumm.Clean(prefix = "stable"))
+f.addStep(Trigger(schedulerNames = [ "stable" ],
updateSourceStamp = True,
waitForFinish = True,
set_properties = { "package": True }))
c["builders"].append( {
- "name": "nightly-branch",
+ "name": "nightly-stable",
"slavename": "localslave",
- "builddir": "nightly-branch",
+ "builddir": "nightly-stable",
"factory": f,
"category": "nightly",
"locks": [ lock_src.access("exclusive") ]
@@ -799,8 +771,8 @@
# Dynamic generated builders based on the platforms defined at the top of this file
-configure_path = "../../src-trunk/src/configure"
-for name, config in scumm_platforms_trunk.items():
+configure_path = "../../src-master/src/configure"
+for name, config in scumm_platforms_master.items():
f = factory.BuildFactory()
f.useProgress = False
@@ -812,8 +784,7 @@
f.addStep(Compile(command = [
"make",
- "-j3",
- WithProperties("VER_SVNREV=%(revision)s")
+ "-j3"
],
env = config["env"]))
@@ -825,24 +796,24 @@
f.addStep(scumm.Strip(command = config["strip"]))
f.addStep(scumm.Package(disttarget = platform_disttarget,
- srcpath = "../../src-trunk/src/",
- dstpath = scumm_package_dst_trunk,
- package = scumm_package_trunk,
- buildname = name + "-trunk",
+ srcpath = "../../src-master/src/",
+ dstpath = scumm_package_dst_master,
+ package = scumm_package_master,
+ buildname = name + "-%s" % scumm_branch_master_desc,
platform_package = config["package"],
env = config["env"]))
c["builders"].append( {
- "name": "trunk-%s" % name,
+ "name": "master-%s" % name,
"slavename": "localslave",
- "builddir": "trunk-%s" % name,
+ "builddir": "master-%s" % name,
"factory": f,
"locks": [ lock_bot.access('counting') ],
- "category": "trunk"
+ "category": "master"
})
-configure_path = "../../src-branch/src/configure"
-for name, config in scumm_platforms_branch.items():
+configure_path = "../../src-stable/src/configure"
+for name, config in scumm_platforms_stable.items():
f = factory.BuildFactory()
f.useProgress = False
@@ -854,8 +825,7 @@
f.addStep(Compile(command = [
"make",
- "-j3",
- WithProperties("VER_SVNREV=%(revision)s")
+ "-j3"
],
env = config["env"]))
@@ -867,20 +837,20 @@
f.addStep(scumm.Strip(command = config["strip"]))
f.addStep(scumm.Package(disttarget = platform_disttarget,
- srcpath = "../../src-branch/src/",
- dstpath = scumm_package_dst_branch,
- package = scumm_package_branch,
- buildname = name + "-%s" % scumm_branch_desc,
+ srcpath = "../../src-stable/src/",
+ dstpath = scumm_package_dst_stable,
+ package = scumm_package_stable,
+ buildname = name + "-%s" % scumm_branch_stable_desc,
platform_package = config["package"],
env = config["env"]))
c["builders"].append( {
- "name": "branch-%s" % name,
+ "name": "stable-%s" % name,
"slavename": "localslave",
- "builddir": "branch-%s" % name,
+ "builddir": "stable-%s" % name,
"factory": f,
"locks": [ lock_bot.access('counting') ],
- "category": "branch"
+ "category": "stable"
})
####### STATUS TARGETS
@@ -894,31 +864,23 @@
web_auth = None
web_force = False
-if scumm_testenv:
- web_force = True
-
-if os.path.exists(htfile):
+if False: #os.path.exists(htfile):
web_auth = HTPasswdAuth(htfile)
web_force = True
c["status"].append(
WebStatus(http_port = "tcp:8010:interface=127.0.0.1",
+ change_hook_dialects = { 'github' : True },
allowForce = web_force,
auth = web_auth
)
)
-if scumm_testenv:
- irc = scumm.IRC("irc.freenode.org", "svmbb",
- channel = "#scummbbtest",
- categories = [ "trunk", "branch" ],
- stableTimer = 15 * 60)
-else:
- irc = scumm.IRC("irc.freenode.org", "ScummBot",
- channel = "#scummvm",
- password= scummsecret.pwd_nickserv,
- categories = [ "trunk", "branch" ],
- stableTimer = 15 * 60)
+irc = scumm.IRC("irc.freenode.org", "ScummBot",
+ channel = "#scummvm",
+ password= scummsecret.pwd_nickserv,
+ categories = [ "master", "stable" ],
+ stableTimer = 15 * 60)
c["status"].append(irc)
@@ -926,8 +888,5 @@
c["projectName"] = "ScummVM"
c["projectURL"] = "http://scummvm.org/"
-if scumm_testenv:
- c["buildbotURL"] = "http://localhost:8010/"
-else:
- c["buildbotURL"] = "http://buildbot.scummvm.org/"
+c["buildbotURL"] = "http://buildbot.scummvm.org/"
Modified: buildbot/config/scumm.py
===================================================================
--- buildbot/config/scumm.py 2011-02-12 14:37:59 UTC (rev 55894)
+++ buildbot/config/scumm.py 2011-02-12 15:34:09 UTC (rev 55895)
@@ -136,7 +136,7 @@
if len(self.disttarget) > 0:
disttarget = True
- name = "%s-r%s" % (self.buildname, properties["revision"])
+ name = "%s-%s" % (self.buildname, properties["revision"][:8])
file = "%s.tar.bz2" % name
symlink = "%s-latest.tar.bz2" % self.buildname
@@ -151,7 +151,7 @@
self.command = ""
if disttarget:
- self.command += "make VER_SVNREV=%s %s && " % (properties["revision"], self.disttarget)
+ self.command += "make %s && " % self.disttarget
self.command += "mkdir %s && " % name
self.command += "cp -r %s %s/ && " % (" ".join(files), name)
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