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

Better support for gradle plugin versions

Browse Source
This commit is contained in:
Daniel Martí 2014-06-19 12:41:34 +02:00
parent 69da721f02
commit 04b61302dc
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fdroidserver/common.py
View File

@ -1136,23 +1136,37 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
version_regex = re.compile(r".*'com\.android\.tools\.build:gradle:([^\.]+\.[^\.]+).*'.*") version_regex = re.compile(r".*'com\.android\.tools\.build:gradle:([^\.]+\.[^\.]+).*'.*")
gradlepluginver = None gradlepluginver = None
with open(os.path.join(root_dir, 'build.gradle')) as f: gradle_files = [os.path.join(root_dir, 'build.gradle')]
for line in f:
match = version_regex.match(line) # Parent dir build.gradle
if match: parent_dir = os.path.normpath(os.path.join(root_dir, '..'))
gradlepluginver = match.group(1) if parent_dir.startswith(build_dir):
gradle_files.append(os.path.join(parent_dir, 'build.gradle'))
# Gradle execution dir build.gradle
if '@' in build['gradle']:
gradle_file = os.path.join(root_dir, build['gradle'].split('@', 1)[1], 'build.gradle')
gradle_file = os.path.normpath(gradle_file)
if gradle_file not in gradle_files:
gradle_files.append(gradle_file)
for path in gradle_files:
if gradlepluginver:
break break
if '@' in build['gradle'] and not gradlepluginver: if not os.path.isfile(path):
gradle_dir = os.path.join(root_dir, build['gradle'].split('@', 1)[1]) continue
gradle_dir = os.path.normpath(gradle_dir) with open(path) as f:
with open(os.path.join(gradle_dir, 'build.gradle')) as f:
for line in f: for line in f:
match = version_regex.match(line) match = version_regex.match(line)
if match: if match:
gradlepluginver = match.group(1) gradlepluginver = match.group(1)
break break
if gradlepluginver:
build['gradlepluginver'] = LooseVersion(gradlepluginver) build['gradlepluginver'] = LooseVersion(gradlepluginver)
else:
logging.warn("Could not fetch the gradle plugin version, defaulting to 0.11")
build['gradlepluginver'] = LooseVersion('0.11')
if build['target']: if build['target']:
n = build["target"].split('-')[1] n = build["target"].split('-')[1]