mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-08-16 03:10:09 +02:00
Centralise handling of default gradle flavours
This commit is contained in:
parent
a195556378
commit
34a3405208
@ -682,9 +682,6 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
|
||||
logging.info("Building Gradle project...")
|
||||
flavours = thisbuild['gradle']
|
||||
|
||||
if len(flavours) == 1 and flavours[0] in ['main', 'yes', '']:
|
||||
flavours[0] = ''
|
||||
|
||||
commands = [config['gradle']]
|
||||
if thisbuild['preassemble']:
|
||||
commands += thisbuild['preassemble'].split()
|
||||
|
@ -358,8 +358,6 @@ def fetch_autoname(app, tag):
|
||||
app_dir = os.path.join(app_dir, app['builds'][-1]['subdir'])
|
||||
if app['builds'][-1]['gradle']:
|
||||
flavours = app['builds'][-1]['gradle']
|
||||
if len(flavours) == 1 and flavours[0] in ['main', 'yes', '']:
|
||||
flavours = None
|
||||
|
||||
logging.debug("...fetch auto name from " + app_dir)
|
||||
new_name = common.fetch_real_name(app_dir, flavours)
|
||||
|
@ -833,10 +833,9 @@ def manifest_paths(app_dir, flavours):
|
||||
os.path.join(app_dir, 'src', 'AndroidManifest.xml'),
|
||||
os.path.join(app_dir, 'build.gradle')]
|
||||
|
||||
if flavours:
|
||||
for flavour in flavours:
|
||||
possible_manifests.append(
|
||||
os.path.join(app_dir, 'src', flavour, 'AndroidManifest.xml'))
|
||||
for flavour in flavours:
|
||||
possible_manifests.append(
|
||||
os.path.join(app_dir, 'src', flavour, 'AndroidManifest.xml'))
|
||||
|
||||
return [path for path in possible_manifests if os.path.isfile(path)]
|
||||
|
||||
@ -1210,11 +1209,9 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
|
||||
f.write(props)
|
||||
f.close()
|
||||
|
||||
flavours = None
|
||||
flavours = []
|
||||
if build['type'] == 'gradle':
|
||||
flavours = build['gradle']
|
||||
if len(flavours) == 1 and flavours[0] in ['main', 'yes', '']:
|
||||
flavours = None
|
||||
|
||||
version_regex = re.compile(r".*'com\.android\.tools\.build:gradle:([^\.]+\.[^\.]+).*'.*")
|
||||
gradlepluginver = None
|
||||
|
@ -601,7 +601,11 @@ def parse_metadata(metafile):
|
||||
t = flagtype(pk)
|
||||
if t == 'list':
|
||||
# Port legacy ';' separators
|
||||
thisbuild[pk] = [v.strip() for v in pv.replace(';', ',').split(',')]
|
||||
pv = [v.strip() for v in pv.replace(';', ',').split(',')]
|
||||
if pk == 'gradle':
|
||||
if len(pv) == 1 and pv[0] in ['main', 'yes', '']:
|
||||
pv = []
|
||||
thisbuild[pk] = pv
|
||||
elif t == 'string' or t == 'script':
|
||||
thisbuild[pk] = pv
|
||||
elif t == 'bool':
|
||||
|
Loading…
Reference in New Issue
Block a user