From 4497d6c91e6aa16a2e6fc31b3f73bb6a20c29ed9 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Mon, 10 Jan 2011 14:54:50 +0000 Subject: [PATCH] Added support for bzr --- README | 3 ++- build.py | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/README b/README index ea618ea1..41cc632d 100644 --- a/README +++ b/README @@ -26,6 +26,7 @@ To be able to auto-build packages, you're going to need: *Ant *Ant Contrib Tasks (Debian package ant-contrib) *JavaCC (Debian package javacc) +*VCS clients: svn, git, hg, bzr *A keystore for holding release keys. (Safe, secure and well backed up!) You then need to create a config.py (copy config.sample.py and follow the @@ -84,7 +85,7 @@ The type of repository - for automatic building from source. If this is not specified, automatic building is disabled for this application. Possible values are: - git, svn, hg + git, svn, hg, bzr ==Repo== diff --git a/build.py b/build.py index 2813041d..bdb0a35a 100644 --- a/build.py +++ b/build.py @@ -120,6 +120,10 @@ for app in apps: if subprocess.call(['hg', 'clone', repo, build_dir]) !=0: print "Hg clone failed" sys.exit(1) + elif app['repotype'] == 'bzr': + if subprocess.call(['bzr', 'branch', repo, build_dir]) !=0: + print "Bzr branch failed" + sys.exit(1) else: print "Invalid repo type " + app['repotype'] + " in " + app['id'] sys.exit(1) @@ -163,7 +167,11 @@ for app in apps: cwd=build_dir) != 0: print "Hg checkout failed" sys.exit(1) - + elif app['repotype'] == 'bzr': + if subprocess.call(['bzr', 'revert', '-r', thisbuild['commit']], + cwd=build_dir) != 0: + print "Bzr revert failed" + sys.exit(1) else: print "Invalid repo type " + app['repotype'] sys.exit(1)