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

lintVital was added in 0.8, only exclude it then

Browse Source
This commit is contained in:
Daniel Martí 2014-06-12 10:00:46 +02:00
parent 3c08b51dfb
commit 9779979e3a
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdroidserver/build.py
View File

@ -29,6 +29,7 @@ import time
import json import json
from ConfigParser import ConfigParser from ConfigParser import ConfigParser
from optparse import OptionParser, OptionError from optparse import OptionParser, OptionError
from distutils.version import LooseVersion
import logging import logging
import common import common
@ -707,7 +708,8 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
# Avoid having to use lintOptions.abortOnError false # Avoid having to use lintOptions.abortOnError false
# TODO: Do flavours or project names change this task name? # TODO: Do flavours or project names change this task name?
commands += ['-x', 'lintVitalRelease'] if thisbuild['gradlepluginver'] >= LooseVersion('0.8'):
commands += ['-x', 'lintVital' + flavours_cmd + 'Release']
p = FDroidPopen(commands, cwd=gradle_dir) p = FDroidPopen(commands, cwd=gradle_dir)

22
fdroidserver/common.py
View File

@ -30,6 +30,7 @@ import Queue
import threading import threading
import magic import magic
import logging import logging
from distutils.version import LooseVersion
import metadata import metadata
@ -1129,6 +1130,27 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
if flavour in ['main', 'yes', '']: if flavour in ['main', 'yes', '']:
flavour = None flavour = None
version_regex = re.compile(r".*'com\.android\.tools\.build:gradle:([^\.]+\.[^\.]+).*'.*")
gradlepluginver = None
with open(os.path.join(root_dir, 'build.gradle')) as f:
for line in f:
match = version_regex.match(line)
if match:
gradlepluginver = match.group(1)
break
if '@' in build['gradle'] and not gradlepluginver:
gradle_dir = os.path.join(root_dir, build['gradle'].split('@', 1)[1])
gradle_dir = os.path.normpath(gradle_dir)
with open(os.path.join(root_dir, 'build.gradle')) as f:
for line in f:
match = version_regex.match(line)
if match:
gradlepluginver = match.group(1)
break
build['gradlepluginver'] = LooseVersion(gradlepluginver)
if build['target']: if build['target']:
n = build["target"].split('-')[1] n = build["target"].split('-')[1]
FDroidPopen(['sed', '-i', FDroidPopen(['sed', '-i',