mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 22:42:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix_532' into 'master'

Browse source 
Fix 532

Closes #532

See merge request fdroid/fdroidserver!541
This commit is contained in:
Marcus 2018-07-25 18:11:56 +00:00
commit 2aaa097962
1 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

28
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
@ -33,24 +34,19 @@ options = None
def get_gradle_compile_commands(build): def get_gradle_compile_commands(build):
compileCommands = ['compile', compileCommands = ['compile',
'provided' 'provided',
'apk' 'apk',
'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()):