kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-20 13:50:12 +01:00
Code Activity

Merge branch 'apk_output_location' into 'master'

Browse Source 
handle gradle-plugin 3.0 output apk location

Closes #363

See merge request !321
This commit is contained in:
Michael Pöhn 2017-09-01 12:21:05 +00:00
commit e9f8f2cc61
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fdroidserver/build.py
View File

@ -275,14 +275,13 @@ def force_gradle_build_tools(build_dir, build_tools):
path) path)
def capitalize_intact(string): def transform_first_char(string, method):
"""Like str.capitalize(), but leave the rest of the string intact without """Uses method() on the first character of string."""
switching it to lowercase."""
if len(string) == 0: if len(string) == 0:
return string return string
if len(string) == 1: if len(string) == 1:
return string.upper() return method(string)
return string[0].upper() + string[1:] return method(string[0]) + string[1:]
def has_native_code(apkobj): def has_native_code(apkobj):
@ -444,7 +443,7 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext
if flavours == ['yes']: if flavours == ['yes']:
flavours = [] flavours = []
flavours_cmd = ''.join([capitalize_intact(flav) for flav in flavours]) flavours_cmd = ''.join([transform_first_char(flav, str.upper) for flav in flavours])
gradletasks += ['assemble' + flavours_cmd + 'Release'] gradletasks += ['assemble' + flavours_cmd + 'Release']
@ -803,11 +802,20 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext
elif omethod == 'gradle': elif omethod == 'gradle':
src = None src = None
for apks_dir in [ apk_dirs = [
os.path.join(root_dir, 'build', 'outputs', 'apk', 'release'), # gradle plugin >= 3.0
os.path.join(root_dir, 'build', 'outputs', 'apk'), os.path.join(root_dir, 'build', 'outputs', 'apk', 'release'),
os.path.join(root_dir, 'build', 'apk'), # gradle plugin < 3.0 and >= 0.11
]: os.path.join(root_dir, 'build', 'outputs', 'apk'),
# really old path
os.path.join(root_dir, 'build', 'apk'),
]
# If we build with gradle flavours with gradle plugin >= 3.0 the apk will be in
# a subdirectory corresponding to the flavour command used, but with different
# capitalization.
if flavours_cmd:
apk_dirs.append(os.path.join(root_dir, 'build', 'outputs', 'apk', transform_first_char(flavours_cmd, str.lower), 'release'))
for apks_dir in apk_dirs:
for apkglob in ['*-release-unsigned.apk', '*-unsigned.apk', '*.apk']: for apkglob in ['*-release-unsigned.apk', '*-unsigned.apk', '*.apk']:
apks = glob.glob(os.path.join(apks_dir, apkglob)) apks = glob.glob(os.path.join(apks_dir, apkglob))