mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-05 18:50:09 +02:00
scanner: properly combine all gradle compile commands with flavors
This commit is contained in:
parent
c44ab190bd
commit
753e9c8175
@ -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()):
|
||||||
|
Loading…
Reference in New Issue
Block a user