LBRYCommunity/buildozer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix android.add_jars to be a "list" type, and be consistent with others token. Multiple .jar are now separated with "," and not ";". Also, it can be configured as a specific section (as all the others list types.)

Browse source
This commit is contained in:
Mathieu Virbel 2013-09-11 15:09:28 +02:00
parent 4d8cf3ecc7
commit a83dfd4cbd
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
buildozer/default.spec
View file

@ -75,11 +75,11 @@ fullscreen = 1
# (str) Android entry point, default is ok for Kivy-based app
#android.entrypoint = org.renpy.android.PythonActivity
# (str) Semicolon separated list of Java .jar files to add to the libs so
# that pyjnius can access their classes. Don't add jars that you do not need,
# since extra jars can slow down the build process. Allows wildcards matching,
# for example: OUYA-ODK/libs/*.jar
#android.add_jars = foo.jar;bar.jar;path/to/more/*.jar
# (list) List of Java .jar files to add to the libs so that pyjnius can access
# their classes. Don't add jars that you do not need, since extra jars can slow
# down the build process. Allows wildcards matching, for example:
# OUYA-ODK/libs/*.jar
#android.add_jars = foo.jar,bar.jar,path/to/more/*.jar
# (str) python-for-android branch to use, if not master, useful to try
# not yet merged features.

20
buildozer/targets/android.py
View file

@ -414,16 +414,16 @@ class TargetAndroid(Target):
build_cmd += ' --permission {0}'.format(permission)
# add extra Java jar files
add_jars = config.getdefault('app', 'android.add_jars', '')
if add_jars:
for pattern in add_jars.split(';'):
pattern = expanduser(pattern.strip())
matches = glob(pattern)
if matches:
for jar in matches:
build_cmd += ' --add-jar "{}"'.format(jar)
else:
raise SystemError("Failed to find jar file: {}".format(pattern))
add_jars = config.getlist('app', 'android.add_jars', [])
for pattern in add_jars:
pattern = join(self.buildozer.root_dir, pattern)
matches = glob(expanduser(pattern.strip()))
if matches:
for jar in matches:
build_cmd += ' --add-jar "{}"'.format(jar)
else:
raise SystemError(
'Failed to find jar file: {}'.format(pattern))
# add presplash
presplash = config.getdefault('app', 'presplash.filename', '')