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

scanner: properly combine all gradle compile commands with flavors

Browse source
This commit is contained in:
Marcus Hoffmann 2018-07-25 18:59:22 +02:00
parent c44ab190bd
commit 753e9c8175
1 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
fdroidserver/scanner.py
View file

@ -21,6 +21,7 @@ import re
import traceback import traceback
from argparse import ArgumentParser from argparse import ArgumentParser
import logging import logging
import itertools
from . import _ from . import _
from . import common from . import common
@ -38,19 +39,14 @@ def get_gradle_compile_commands(build):
'implementation', 'implementation',
'api', 'api',
'compileOnly', 'compileOnly',
'runtimeOnly', 'runtimeOnly']
'releaseCompile', buildTypes = ['', 'release']
'releaseProvided', flavors = ['']
'releaseApk',
'releaseImplementation',
'releaseApi',
'releaseCompileOnly',
'releaseRuntimeOnly']
if build.gradle and build.gradle != ['yes']: if build.gradle and build.gradle != ['yes']:
compileCommands += [flavor + 'Compile' for flavor in build.gradle] flavors += build.gradle
compileCommands += [flavor + 'ReleaseCompile' for flavor in build.gradle]
return [re.compile(r'\s*' + c, re.IGNORECASE) for c in compileCommands] commands = [''.join(c) for c in itertools.product(flavors, buildTypes, compileCommands)]
return [re.compile(r'\s*' + c, re.IGNORECASE) for c in commands]
def scan_source(build_dir, build=metadata.Build()): def scan_source(build_dir, build=metadata.Build()):