mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-07 07:50:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Lots of build system improvements and fixes

Browse source
This commit is contained in:
Ciaran Gultnieks 2012-09-08 09:56:20 +01:00
parent fdc6331eeb
commit 09e296d2de
6 changed files with 66 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

12
fdroidserver/checkupdates.py
View file

@ -38,7 +38,7 @@ from common import VCSException
# caution, because it's inappropriate for many projects.
# Returns (None, "a message") if this didn't work, or (version, vercode) for
# the details of the current version.
def check_tags(app):
def check_tags(app, sdk_path):
try:
@ -48,7 +48,7 @@ def check_tags(app):
return (None, 'Tags update mode only works for git repositories currently')
# Set up vcs interface and make sure we have the latest code...
vcs = common.getvcs(app['Repo Type'], app['Repo'], build_dir)
vcs = common.getvcs(app['Repo Type'], app['Repo'], build_dir, sdk_path)
vcs.gotorevision('origin/master')
if len(app['builds']) == 0:
@ -91,7 +91,7 @@ def check_tags(app):
# caution, because it's inappropriate for many projects.
# Returns (None, "a message") if this didn't work, or (version, vercode) for
# the details of the current version.
def check_repomanifest(app):
def check_repomanifest(app, sdk_path):
try:
@ -101,7 +101,7 @@ def check_repomanifest(app):
return (None, 'RepoManifest update mode only works for git repositories currently')
# Set up vcs interface and make sure we have the latest code...
vcs = common.getvcs(app['Repo Type'], app['Repo'], build_dir)
vcs = common.getvcs(app['Repo Type'], app['Repo'], build_dir, sdk_path)
vcs.gotorevision('origin/master')
if len(app['builds']) == 0:
@ -201,9 +201,9 @@ def main():
if mode == 'Market':
(version, vercode) = check_market(app)
elif mode == 'Tags':
(version, vercode) = check_tags(app)
(version, vercode) = check_tags(app, sdk_path)
elif mode == 'RepoManifest':
(version, vercode) = check_repomanifest(app)
(version, vercode) = check_repomanifest(app, sdk_path)
elif mode == 'None':
version = None
vercode = 'Checking disabled'