mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 15:00:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of gitorious.org:f-droid/fdroidserver

Browse source
This commit is contained in:
Ciaran Gultnieks 2014-01-16 10:18:10 +00:00
commit 66e540772f
4 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

24
fdroidserver/build.py
View file

@ -405,6 +405,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
p = FDroidPopen(cmd, cwd=maven_dir)
elif thisbuild['type'] == 'gradle':
print "Cleaning Gradle project..."
cmd = [config['gradle'], 'clean']
@ -414,6 +415,10 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
else:
gradle_dir = root_dir
adapt_gradle(gradle_dir)
for name, number, libpath in srclibpaths:
adapt_gradle(libpath)
p = FDroidPopen(cmd, cwd=gradle_dir)
elif thisbuild['type'] == 'kivy':
@ -582,11 +587,11 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
elif thisbuild['type'] == 'gradle':
print "Building Gradle project..."
if '@' in thisbuild['gradle']:
flavour = thisbuild['gradle'].split('@')[0]
flavours = thisbuild['gradle'].split('@')[0].split(',')
gradle_dir = thisbuild['gradle'].split('@')[1]
gradle_dir = os.path.join(root_dir, gradle_dir)
else:
flavour = thisbuild['gradle']
flavours = thisbuild['gradle'].split(',')
gradle_dir = root_dir
@ -600,19 +605,14 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
's@compileSdkVersion[ ]*[0-9]*@compileSdkVersion '+level+'@g',
'build.gradle'], cwd=gradle_dir)
adapt_gradle(gradle_dir)
for name, number, libpath in srclibpaths:
adapt_gradle(libpath)
if flavour in ['main', 'yes', '']:
flavour = ''
if len(flavours) == 1 and flavours[0] in ['main', 'yes', '']:
flavours[0] = ''
commands = [config['gradle']]
if 'preassemble' in thisbuild:
for task in thisbuild['preassemble'].split():
commands.append(task)
commands += ['assemble'+flavour+'Release']
commands += ['assemble'+''.join(flavours)+'Release']
p = FDroidPopen(commands, cwd=gradle_dir)
@ -657,10 +657,10 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
dd = build_dir
if 'subdir' in thisbuild:
dd = os.path.join(dd, thisbuild['subdir'])
if flavour in ['main', 'yes', '']:
if len(flavours) == 1 and flavours[0] == '':
name = '-'.join([os.path.basename(dd), 'release', 'unsigned'])
else:
name = '-'.join([os.path.basename(dd), flavour, 'release', 'unsigned'])
name = '-'.join([os.path.basename(dd), '-'.join(flavours), 'release', 'unsigned'])
src = os.path.join(dd, 'build', 'apk', name+'.apk')
else:
stdout_apk = '\n'.join([