Merge branch 'master' of github.com:kivy/pyjnius

Conflicts:
	setup.py
This commit is contained in:
Mathieu Virbel 2012-08-21 01:22:14 +02:00
commit 852ba4132e
2 changed files with 5 additions and 2 deletions

View File

@ -9,7 +9,7 @@ Quick overview
-------------- --------------
```python ```python
>>> from jnius.reflect import autoclass >>> from jnius import autoclass
>>> autoclass('java.lang.System').out.println('Hello world') >>> autoclass('java.lang.System').out.println('Hello world')
Hello world Hello world

View File

@ -19,6 +19,7 @@ libraries = []
library_dirs = [] library_dirs = []
extra_link_args = [] extra_link_args = []
include_dirs = [] include_dirs = []
install_requires = []
# detect Python for android # detect Python for android
platform = sys.platform platform = sys.platform
@ -29,6 +30,7 @@ if ndkplatform is not None and environ.get('LIBLINK'):
# detect cython # detect cython
try: try:
from Cython.Distutils import build_ext from Cython.Distutils import build_ext
install_requires.append('cython')
except ImportError: except ImportError:
from distutils.command.build_ext import build_ext from distutils.command.build_ext import build_ext
if platform != 'android': if platform != 'android':
@ -80,6 +82,7 @@ setup(name='jnius',
url='http://pyjnius.readthedocs.org/', url='http://pyjnius.readthedocs.org/',
author='Mathieu Virbel and Gabriel Pettier', author='Mathieu Virbel and Gabriel Pettier',
author_email='mat@kivy.org,gabriel@kivy.org', author_email='mat@kivy.org,gabriel@kivy.org',
install_requires=install_requires,
ext_package='jnius', ext_package='jnius',
ext_modules=[ ext_modules=[
Extension( Extension(
@ -88,5 +91,5 @@ setup(name='jnius',
library_dirs=library_dirs, library_dirs=library_dirs,
include_dirs=include_dirs, include_dirs=include_dirs,
extra_link_args=extra_link_args) extra_link_args=extra_link_args)
] ],
) )