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

Merge commit 'refs/merge-requests/21' of git://gitorious.org/f-droid/fdroidserver into merge-requests/21

Browse source
This commit is contained in:
Ciaran Gultnieks 2011-06-17 08:35:56 +01:00
commit 36750e7c1e
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
build.py
View file

@ -56,15 +56,23 @@ if options.clean:
if not os.path.exists(built_dir): if not os.path.exists(built_dir):
os.mkdir(built_dir) os.mkdir(built_dir)
if not os.path.isdir('build'):
os.makedirs('build')
for app in apps: for app in apps:
if app['disabled']:
print "Skipping %s: disabled" % app['id']
elif not app['builds']:
print "Skipping %s: no builds specified" % app['id']
if (app['disabled'] is None and app['repo'] != '' if (app['disabled'] is None and app['repo'] != ''
and app['repotype'] != '' and (options.package is None or and app['repotype'] != '' and (options.package is None or
options.package == app['id']) and len(app['builds']) > 0): options.package == app['id']) and len(app['builds']) > 0):
print "Processing " + app['id'] print "Processing " + app['id']
build_dir = 'build_' + app['id'] build_dir = 'build/' + app['id']
got_source = False got_source = False
@ -428,7 +436,7 @@ for app in apps:
output = p.communicate()[0] output = p.communicate()[0]
if p.returncode != 0: if p.returncode != 0:
print output print output
print "NDK build failed" print "NDK build failed for %s:%s" % (app['id'], thisbuild['version'])
sys.exit(1) sys.exit(1)
elif options.verbose: elif options.verbose:
print output print output
@ -448,7 +456,7 @@ for app in apps:
output = p.communicate()[0] output = p.communicate()[0]
if p.returncode != 0: if p.returncode != 0:
print output print output
print "Build failed" print "Build failed for %s:%s" % (app['id'], thisbuild['version'])
sys.exit(1) sys.exit(1)
elif options.verbose: elif options.verbose:
print output print output

2
common.py
View file

@ -153,7 +153,7 @@ def parse_metadata(metafile, **kw):
def read_metadata(verbose=False): def read_metadata(verbose=False):
apps = [] apps = []
for metafile in glob.glob(os.path.join('metadata', '*.txt')): for metafile in sorted(glob.glob(os.path.join('metadata', '*.txt'))):
if verbose: if verbose:
print "Reading " + metafile print "Reading " + metafile
apps.append(parse_metadata(metafile, verbose=verbose)) apps.append(parse_metadata(metafile, verbose=verbose))