From: Ciaran Gultnieks Date: Mon, 3 Jan 2011 10:55:18 +0000 (+0000) Subject: Added support for mercurial X-Git-Tag: 0.1~1579 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a6b4830addc037e6f254a359725bff6b88b30c38;p=fdroidserver.git Added support for mercurial --- diff --git a/README b/README index 8258772d..24be3d70 100644 --- a/README +++ b/README @@ -68,7 +68,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 + git, svn, hg ==Repo== diff --git a/build.py b/build.py index 87b89149..ec7ce1c1 100644 --- a/build.py +++ b/build.py @@ -65,7 +65,7 @@ for app in apps: # Get the source code... if app['repotype'] == 'git': - if subprocess.call(['git', 'clone',app['repo'], build_dir]) != 0: + if subprocess.call(['git', 'clone', app['repo'], build_dir]) != 0: print "Git clone failed" sys.exit(1) elif app['repotype'] == 'svn': @@ -73,6 +73,10 @@ for app in apps: if subprocess.call(['svn', 'checkout', app['repo'], build_dir]) != 0: print "Svn checkout failed" sys.exit(1) + elif app['repotype'] == 'hg': + if subprocess.call(['hg', 'clone', app['repo'], build_dir]) !=0: + print "Hg clone failed" + sys.exit(1) else: print "Invalid repo type " + app['repotype'] + " in " + app['id'] sys.exit(1) @@ -105,6 +109,12 @@ for app in apps: cwd=build_dir) != 0: print "Svn update failed" sys.exit(1) + elif app['repotype'] == 'hg': + if subprocess.call(['hg', 'checkout', thisbuild['commit']], + cwd=build_dir) != 0: + print "Hg checkout failed" + sys.exit(1) + else: print "Invalid repo type " + app['repotype'] sys.exit(1)