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

Fix silly object name issue, also clean jni dirs

Browse source
This commit is contained in:
Daniel Martí 2013-10-10 16:30:32 +02:00
parent b315968bea
commit f9eda50276
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
fdroidserver/build.py
View file

@ -390,6 +390,16 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
else: else:
error += line error += line
# Also clean jni
print "Cleaning jni dirs..."
for baddir in [
'libs/armeabi-v7a', 'libs/armeabi',
'libs/mips', 'libs/x86']:
badpath = os.path.join(build_dir, baddir)
if os.path.exists(badpath):
print "Removing '%s'" % badpath
shutil.rmtree(badpath)
# Scan before building... # Scan before building...
print "Scanning source for common problems..." print "Scanning source for common problems..."
buildprobs = common.scan_source(build_dir, root_dir, thisbuild) buildprobs = common.scan_source(build_dir, root_dir, thisbuild)

4
fdroidserver/common.py
View file

@ -1208,7 +1208,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, sdk_path,
p.communicate() p.communicate()
if p.returncode != 0: if p.returncode != 0:
raise BuildException("Error running init command for %s:%s" % raise BuildException("Error running init command for %s:%s" %
(app['id'], thisbuild['version']), output, error) (app['id'], build['version']), output, error)
# Generate (or update) the ant build file, build.xml... # Generate (or update) the ant build file, build.xml...
updatemode = build.get('update', '.') updatemode = build.get('update', '.')
@ -1430,7 +1430,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, sdk_path,
p.communicate() p.communicate()
if p.returncode != 0: if p.returncode != 0:
raise BuildException("Error running prebuild command for %s:%s" % raise BuildException("Error running prebuild command for %s:%s" %
(app['id'], thisbuild['version']), output, error) (app['id'], build['version']), output, error)
print "Applying generic clean-ups..." print "Applying generic clean-ups..."
if build.get('anal-tics', 'no') == 'yes': if build.get('anal-tics', 'no') == 'yes':