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

buildjni is a list field too, some server fixes

Browse source
This commit is contained in:
Daniel Martí 2014-02-15 10:56:35 +01:00
parent d0cde659ca
commit 67acf4c3fc
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
fdroidserver/build.py
View file

@ -266,7 +266,7 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
# Copy any extlibs that are required... # Copy any extlibs that are required...
if 'extlibs' in thisbuild: if 'extlibs' in thisbuild:
ftp.chdir('/home/vagrant/build/extlib') ftp.chdir('/home/vagrant/build/extlib')
for lib in thisbuild['extlibs'].split(';'): for lib in thisbuild['extlibs']:
lib = lib.strip() lib = lib.strip()
libsrc = os.path.join('build/extlib', lib) libsrc = os.path.join('build/extlib', lib)
if not os.path.exists(libsrc): if not os.path.exists(libsrc):
@ -282,7 +282,7 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
# Copy any srclibs that are required... # Copy any srclibs that are required...
srclibpaths = [] srclibpaths = []
if 'srclibs' in thisbuild: if 'srclibs' in thisbuild:
for lib in thisbuild['srclibs'].split(';'): for lib in thisbuild['srclibs']:
srclibpaths.append(common.getsrclib(lib, 'build/srclib', srclibpaths, srclibpaths.append(common.getsrclib(lib, 'build/srclib', srclibpaths,
basepath=True, prepare=False)) basepath=True, prepare=False))
@ -459,10 +459,8 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
if thisbuild.get('buildjni') not in (None, 'no'): if thisbuild.get('buildjni') not in (None, 'no'):
logging.info("Building native libraries...") logging.info("Building native libraries...")
jni_components = thisbuild.get('buildjni') jni_components = thisbuild.get('buildjni')
if jni_components == 'yes': if jni_components == ['yes']:
jni_components = [''] jni_components = ['']
else:
jni_components = [c.strip() for c in jni_components.split(';')]
ndkbuild = os.path.join(config['ndk_path'], "ndk-build") ndkbuild = os.path.join(config['ndk_path'], "ndk-build")
for d in jni_components: for d in jni_components:
logging.info("Building native code in '%s'" % d) logging.info("Building native code in '%s'" % d)

3
fdroidserver/metadata.py
View file

@ -451,7 +451,8 @@ def metafieldtype(name):
return 'string' return 'string'
def flagtype(name): def flagtype(name):
if name in ['extlibs', 'srclibs', 'patch', 'rm', 'scanignore', 'scandelete']: if name in ['extlibs', 'srclibs', 'patch', 'rm', 'buildjni',
'scanignore', 'scandelete']:
return 'list' return 'list'
if name in ['init', 'prebuild', 'build']: if name in ['init', 'prebuild', 'build']:
return 'script' return 'script'