kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-09 00:40:11 +01:00
Code Activity

Merge branch 'master' of gitorious.org:f-droid/fdroidserver

Browse Source
This commit is contained in:
Ciaran Gultnieks 2013-10-29 15:43:56 +00:00
commit 392e547c1a
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
View File

@ -1,7 +1,7 @@
user = node[:settings][:user] user = node[:settings][:user]
%w{ant ant-contrib autoconf autopoint bison cmake expect libtool libsaxonb-java libssl1.0.0 libssl-dev maven openjdk-7-jdk javacc python python-magic git-core mercurial subversion bzr git-svn make perlmagick pkg-config zip ruby rubygems librmagick-ruby yasm imagemagick gettext}.each do |pkg| %w{ant ant-contrib autoconf autopoint bison cmake expect libtool libsaxonb-java libssl1.0.0 libssl-dev maven openjdk-7-jdk javacc python python-magic git-core mercurial subversion bzr git-svn make perlmagick pkg-config zip ruby rubygems librmagick-ruby yasm imagemagick gettext realpath}.each do |pkg|
package pkg do package pkg do
action :install action :install
end end

17
fdroidserver/checkupdates.py
View File

@ -106,6 +106,7 @@ def check_tags(app, sdk_path):
if 'gradle' in app['builds'][-1]: if 'gradle' in app['builds'][-1]:
flavour = app['builds'][-1]['gradle'] flavour = app['builds'][-1]['gradle']
htag = None
hver = None hver = None
hcode = "0" hcode = "0"
@ -118,22 +119,23 @@ def check_tags(app, sdk_path):
if package and package == app['id'] and version and vercode: if package and package == app['id'] and version and vercode:
print "Manifest exists. Found version %s" % version print "Manifest exists. Found version %s" % version
if int(vercode) > int(hcode): if int(vercode) > int(hcode):
htag = tag
hcode = str(int(vercode)) hcode = str(int(vercode))
hver = version hver = version
if hver: if hver:
return (hver, hcode) return (hver, hcode, htag)
return (None, "Couldn't find any version information") return (None, "Couldn't find any version information", None)
except BuildException as be: except BuildException as be:
msg = "Could not scan app %s due to BuildException: %s" % (app['id'], be) msg = "Could not scan app %s due to BuildException: %s" % (app['id'], be)
return (None, msg) return (None, msg, None)
except VCSException as vcse: except VCSException as vcse:
msg = "VCS error while scanning app %s: %s" % (app['id'], vcse) msg = "VCS error while scanning app %s: %s" % (app['id'], vcse)
return (None, msg) return (None, msg, None)
except Exception: except Exception:
msg = "Could not scan app %s due to unknown error: %s" % (app['id'], traceback.format_exc()) msg = "Could not scan app %s due to unknown error: %s" % (app['id'], traceback.format_exc())
return (None, msg) return (None, msg, None)
# Check for a new version by looking at the AndroidManifest.xml at the HEAD # Check for a new version by looking at the AndroidManifest.xml at the HEAD
# of the source repo. Whether this can be used reliably or not depends on # of the source repo. Whether this can be used reliably or not depends on
@ -329,9 +331,10 @@ def main():
writeit = False writeit = False
logmsg = None logmsg = None
tag = None
mode = app['Update Check Mode'] mode = app['Update Check Mode']
if mode == 'Tags': if mode == 'Tags':
(version, vercode) = check_tags(app, sdk_path) (version, vercode, tag) = check_tags(app, sdk_path)
elif mode == 'RepoManifest': elif mode == 'RepoManifest':
(version, vercode) = check_repomanifest(app, sdk_path) (version, vercode) = check_repomanifest(app, sdk_path)
elif mode.startswith('RepoManifest/'): elif mode.startswith('RepoManifest/'):
@ -372,7 +375,7 @@ def main():
app_dir = os.path.join('build/', app['id']) app_dir = os.path.join('build/', app['id'])
vcs = common.getvcs(app["Repo Type"], app["Repo"], app_dir, sdk_path) vcs = common.getvcs(app["Repo Type"], app["Repo"], app_dir, sdk_path)
vcs.gotorevision(None) vcs.gotorevision(tag)
flavour = None flavour = None
if len(app['builds']) > 0: if len(app['builds']) > 0:

6
fdroidserver/common.py
View File

@ -475,7 +475,7 @@ def parse_metadata(metafile, verbose=False):
if parts[2].startswith('!'): if parts[2].startswith('!'):
# For backwards compatibility, handle old-style disabling, # For backwards compatibility, handle old-style disabling,
# including attempting to extract the commit from the message # including attempting to extract the commit from the message
thisbuild['disable'] = parts[2] thisbuild['disable'] = parts[2][1:]
commit = 'unknown - see disabled' commit = 'unknown - see disabled'
index = parts[2].rfind('at ') index = parts[2].rfind('at ')
if index != -1: if index != -1:
@ -1711,7 +1711,7 @@ def scan_source(build_dir, root_dir, thisbuild):
for suspect in usual_suspects: for suspect in usual_suspects:
if suspect in curfile.lower(): if suspect in curfile.lower():
problems.append('Found probable non-free blob ' + fp) problems.append('Found usual supect in filename ' + fp)
mime = ms.file(fp) mime = ms.file(fp)
if mime == 'application/x-sharedlib': if mime == 'application/x-sharedlib':
@ -1720,7 +1720,7 @@ def scan_source(build_dir, root_dir, thisbuild):
problems.append('Found static library at %s' % fd) problems.append('Found static library at %s' % fd)
elif mime == 'application/x-executable': elif mime == 'application/x-executable':
problems.append('Found binary executable at %s' % fd) problems.append('Found binary executable at %s' % fd)
elif fp.endswith('.apk'): elif mime == 'application/jar' and fp.endswith('.apk'):
problems.append('Found apk archive at %s' % fd) problems.append('Found apk archive at %s' % fd)
elif curfile.endswith('.java'): elif curfile.endswith('.java'):

2
tools/commitupdates
View File

@ -36,7 +36,7 @@ while read line; do
[ -d metadata/$id ] && extra=metadata/$id [ -d metadata/$id ] && extra=metadata/$id
[ -n "$name" ] && id="$name ($id)" [ -n "$name" ] && id="$name ($id)"
commands+=("git commit -m 'Update $id to $version ($vercode)' -e -- $file $extra") commands+=("git commit -m 'Update $id to $version ($vercode)' -e -v -- $file $extra")
fi fi
done < <(git status --porcelain) done < <(git status --porcelain)