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

Centralise handling of default gradle flavours

Browse source
This commit is contained in:
Daniel Martí 2014-09-13 13:04:24 +02:00
parent a195556378
commit 34a3405208
4 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
fdroidserver/build.py
View file

@ -682,9 +682,6 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
logging.info("Building Gradle project...") logging.info("Building Gradle project...")
flavours = thisbuild['gradle'] flavours = thisbuild['gradle']
if len(flavours) == 1 and flavours[0] in ['main', 'yes', '']:
flavours[0] = ''
commands = [config['gradle']] commands = [config['gradle']]
if thisbuild['preassemble']: if thisbuild['preassemble']:
commands += thisbuild['preassemble'].split() commands += thisbuild['preassemble'].split()

2
fdroidserver/checkupdates.py
View file

@ -358,8 +358,6 @@ def fetch_autoname(app, tag):
app_dir = os.path.join(app_dir, app['builds'][-1]['subdir']) app_dir = os.path.join(app_dir, app['builds'][-1]['subdir'])
if app['builds'][-1]['gradle']: if app['builds'][-1]['gradle']:
flavours = 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) logging.debug("...fetch auto name from " + app_dir)
new_name = common.fetch_real_name(app_dir, flavours) new_name = common.fetch_real_name(app_dir, flavours)

11
fdroidserver/common.py
View file

@ -833,10 +833,9 @@ def manifest_paths(app_dir, flavours):
os.path.join(app_dir, 'src', 'AndroidManifest.xml'), os.path.join(app_dir, 'src', 'AndroidManifest.xml'),
os.path.join(app_dir, 'build.gradle')] os.path.join(app_dir, 'build.gradle')]
if flavours: for flavour in flavours:
for flavour in flavours: possible_manifests.append(
possible_manifests.append( os.path.join(app_dir, 'src', flavour, 'AndroidManifest.xml'))
os.path.join(app_dir, 'src', flavour, 'AndroidManifest.xml'))
return [path for path in possible_manifests if os.path.isfile(path)] 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.write(props)
f.close() f.close()
flavours = None flavours = []
if build['type'] == 'gradle': if build['type'] == 'gradle':
flavours = build['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:([^\.]+\.[^\.]+).*'.*") version_regex = re.compile(r".*'com\.android\.tools\.build:gradle:([^\.]+\.[^\.]+).*'.*")
gradlepluginver = None gradlepluginver = None

6
fdroidserver/metadata.py
View file

@ -601,7 +601,11 @@ def parse_metadata(metafile):
t = flagtype(pk) t = flagtype(pk)
if t == 'list': if t == 'list':
# Port legacy ';' separators # 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': elif t == 'string' or t == 'script':
thisbuild[pk] = pv thisbuild[pk] = pv
elif t == 'bool': elif t == 'bool':