mirror/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2026-03-21 16:31:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Just get rid of bin/ and gen/ rather than failing scans

Browse Source
This commit is contained in:
Ciaran Gultnieks
2012-02-18 14:37:43 +00:00
parent 9d6f5bf887
commit d38317f8be
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
common.py
View File

@@ -825,6 +825,13 @@ def prepare_source(vcs, app, build, build_dir, extlib_dir, sdk_path, ndk_path, j
if basesrclib: if basesrclib:
srclibpaths.append(basesrclib) srclibpaths.append(basesrclib)
# There should never be gen or bin directories in the source, so just get
# rid of them...
for baddir in ['gen', 'bin']:
badpath = os.path.join(root_dir, 'gen')
if os.path.exists(badpath):
shutil.rmtree(badpath)
# Run a pre-build command if one is required... # Run a pre-build command if one is required...
if build.has_key('prebuild'): if build.has_key('prebuild'):
prebuild = build['prebuild'] prebuild = build['prebuild']
@@ -954,15 +961,6 @@ def scan_source(build_dir, root_dir, thisbuild):
msg = 'Found jni directory, but buildjni is not enabled' msg = 'Found jni directory, but buildjni is not enabled'
problems.append(msg) problems.append(msg)
# Presence of these is not a problem as such, but they
# shouldn't be there and mess up our source tarballs...
if os.path.exists(os.path.join(root_dir, 'bin')):
msg = "There shouldn't be a bin directory"
problems.append(msg)
if os.path.exists(os.path.join(root_dir, 'gen')):
msg = "There shouldn't be a gen directory"
problems.append(msg)
return problems return problems