Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' of ssh://github.com/kivy/python-for-android
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
  • Loading branch information
tito committed Aug 3, 2012
2 parents 1c067f2 + da9335a commit eeb162b
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 8 deletions.
2 changes: 1 addition & 1 deletion distribute.sh
Expand Up @@ -92,7 +92,7 @@ function push_arm() {
#export OFLAG="-O2"

export CFLAGS="-mandroid $OFLAG -fomit-frame-pointer --sysroot $NDKPLATFORM"
if [ $ARCH == "armeabi-v7a" ]; then
if [ "X$ARCH" == "Xarmeabi-v7a" ]; then
CFLAGS+=" -march=armv7-a -mfloat-abi=softfp -mfpu=vfp -mthumb"
fi
export CXXFLAGS="$CFLAGS"
Expand Down
6 changes: 5 additions & 1 deletion docs/source/prerequisites.rst
@@ -1,6 +1,10 @@
Prerequisites
=============

.. note::
There is a VirtualBox Image we provide with the prerequisites along with
Android SDK and NDK preinstalled to ease your installation woes. You can download it from `here <http://www.google.com/url?sa=D&q=https://docs.google.com/file/d/0B1WO07-OL50_VDNESDRUaDhXSmM/edit&usg=AFQjCNGrsg0SU8EMgAcLHWxbjSe8KM2kyA>`__.

.. warning::

The current version is tested only on Ubuntu oneiric (11.10) and precise
Expand Down Expand Up @@ -58,5 +62,5 @@ After installing them, export both installation path, NDK version and API to use

Also, you must configure you're PATH to add the ``android`` binary::

export PATH=/path/to/android-ndk:/path/to/android-sdk-linux/tools:$PATH
export PATH=$ANDROIDNDK:$ANDROIDSDK/tools:$PATH

15 changes: 9 additions & 6 deletions recipes/hostpython/recipe.sh
Expand Up @@ -24,13 +24,16 @@ function build_hostpython() {

try ./configure
try make -j5
try mv python hostpython
try mv Parser/pgen hostpgen
#try mkdir -p ../prebuilt/Python-$PYVERSION/lib
#try cp hostpython ../prebuilt/Python-$PYVERSION/
#try cp hostpgen ../prebuilt/Python-$PYVERSION/
#try cp build/lib.*/*.so ../prebuilt/Python-$PYVERSION/lib/
#try cd ..

if [ -f python.exe ]; then
try mv python.exe hostpython
elif [ -f python ]; then
try mv python hostpython
else
error "Unable to found the python executable?"
exit 1
fi
}

function postbuild_hostpython() {
Expand Down

0 comments on commit eeb162b

Please sign in to comment.