mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-16 07:52:35 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Run adapt_gradle before running gradle clean

Browse source
This commit is contained in:
Daniel Martí 2014-01-16 00:20:26 +01:00
parent f8089d3b9e
commit 06668ab1cd
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
fdroidserver/build.py
View file

@ -412,6 +412,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
p = FDroidPopen(cmd, cwd=maven_dir) p = FDroidPopen(cmd, cwd=maven_dir)
elif thisbuild['type'] == 'gradle': elif thisbuild['type'] == 'gradle':
print "Cleaning Gradle project..." print "Cleaning Gradle project..."
cmd = [config['gradle'], 'clean'] cmd = [config['gradle'], 'clean']
@ -421,6 +422,10 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
else: else:
gradle_dir = root_dir gradle_dir = root_dir
adapt_gradle(gradle_dir)
for name, number, libpath in srclibpaths:
adapt_gradle(libpath)
p = FDroidPopen(cmd, cwd=gradle_dir) p = FDroidPopen(cmd, cwd=gradle_dir)
elif thisbuild['type'] == 'kivy': elif thisbuild['type'] == 'kivy':
@ -607,11 +612,6 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
's@compileSdkVersion[ ]*[0-9]*@compileSdkVersion '+level+'@g', 's@compileSdkVersion[ ]*[0-9]*@compileSdkVersion '+level+'@g',
'build.gradle'], cwd=gradle_dir) 'build.gradle'], cwd=gradle_dir)
adapt_gradle(gradle_dir)
for name, number, libpath in srclibpaths:
adapt_gradle(libpath)
if len(flavours) == 1 and flavours[0] in ['main', 'yes', '']: if len(flavours) == 1 and flavours[0] in ['main', 'yes', '']:
flavours[0] = '' flavours[0] = ''