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

Remove gradle=main

Browse source 
It was only supported in txt metadata, and was unused in fdroiddata
anyway.
This commit is contained in:
Daniel Martí 2015-12-03 10:56:59 +01:00
parent 5e0bc7f2c3
commit 1987ee7f54
2 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/fdroid.texi
View file

@ -1054,9 +1054,9 @@ adding them to 'ndk_paths' in your config file.
Build with Gradle instead of Ant, specifying what flavours to use. Flavours Build with Gradle instead of Ant, specifying what flavours to use. Flavours
are case sensitive since the path to the output apk is as well. are case sensitive since the path to the output apk is as well.
If only one flavour is given and it is 'yes' or 'main', no flavour will be If only one flavour is given and it is 'yes', no flavour will be used.
used. Note that for projects with flavours, you must specify at least one Note that for projects with flavours, you must specify at least one
valid flavour since 'yes' or 'main' will build all of them separately. valid flavour since 'yes' will build all of them separately.
@item maven=yes[@@<dir>] @item maven=yes[@@<dir>]
Build with Maven instead of Ant. An extra @@<dir> tells F-Droid to run Maven Build with Maven instead of Ant. An extra @@<dir> tells F-Droid to run Maven

27
fdroidserver/metadata.py
View file

@ -981,7 +981,8 @@ def parse_yaml_metadata(metadatapath):
return app return app
build_line_sep = re.compile(r"(?<!\\),") build_line_sep = re.compile(r'(?<!\\),')
build_cont = re.compile(r'^[ \t]')
def parse_txt_metadata(metadatapath): def parse_txt_metadata(metadatapath):
@ -1005,15 +1006,11 @@ def parse_txt_metadata(metadatapath):
t = flagtype(pk) t = flagtype(pk)
if t == 'list': if t == 'list':
pv = split_list_values(pv) pv = split_list_values(pv)
if pk == 'gradle':
if len(pv) == 1 and pv[0] in ['main', 'yes']:
pv = ['yes']
build.set_flag(pk, pv) build.set_flag(pk, pv)
elif t == 'string' or t == 'script': elif t == 'string' or t == 'script':
build.set_flag(pk, pv) build.set_flag(pk, pv)
elif t == 'bool': elif t == 'bool':
v = pv == 'yes' if pv == 'yes':
if v:
build.set_flag(pk, True) build.set_flag(pk, True)
else: else:
@ -1068,15 +1065,7 @@ def parse_txt_metadata(metadatapath):
linedesc = "%s:%d" % (metafile.name, c) linedesc = "%s:%d" % (metafile.name, c)
line = line.rstrip('\r\n') line = line.rstrip('\r\n')
if mode == 3: if mode == 3:
if not any(line.startswith(s) for s in (' ', '\t')): if build_cont.match(line):
if not build.commit and not build.disable:
raise MetaDataException("No commit specified for {0} in {1}"
.format(build.version, linedesc))
app.builds.append(build)
add_comments('build:' + build.vercode)
mode = 0
else:
if line.endswith('\\'): if line.endswith('\\'):
buildlines.append(line[:-1].lstrip()) buildlines.append(line[:-1].lstrip())
else: else:
@ -1084,6 +1073,14 @@ def parse_txt_metadata(metadatapath):
bl = ''.join(buildlines) bl = ''.join(buildlines)
add_buildflag(bl, build) add_buildflag(bl, build)
buildlines = [] buildlines = []
else:
if not build.commit and not build.disable:
raise MetaDataException("No commit specified for {0} in {1}"
.format(build.version, linedesc))
app.builds.append(build)
add_comments('build:' + build.vercode)
mode = 0
if mode == 0: if mode == 0:
if not line: if not line: