Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Defines NDK_ROOT and PYTHON_BIN in top level.

This commit is contained in:
James Chen 2014-02-11 14:12:13 +08:00
parent d8f89b8045
commit d779aaa967
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/travis-scripts/run-script.sh
View File

@ -5,6 +5,9 @@ set -e
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
COCOS2DX_ROOT="$DIR"/../.. COCOS2DX_ROOT="$DIR"/../..
export NDK_ROOT=$HOME/bin/android-ndk
export PYTHON_BIN=/usr/bin/python
if [ "$GEN_JSB"x = "YES"x ]; then if [ "$GEN_JSB"x = "YES"x ]; then
# Re-generation of the javascript bindings can perform push of the new # Re-generation of the javascript bindings can perform push of the new
# version back to github. We don't do this for pull requests, or if # version back to github. We don't do this for pull requests, or if
@ -26,8 +29,7 @@ if [ "$GEN_JSB"x = "YES"x ]; then
echo "GH_USER not set" echo "GH_USER not set"
exit 0 exit 0
fi fi
export NDK_ROOT=$HOME/bin/android-ndk
export PYTHON_BIN=/usr/bin/python
cd $COCOS2DX_ROOT/tools/travis-scripts cd $COCOS2DX_ROOT/tools/travis-scripts
./generate-jsbindings.sh ./generate-jsbindings.sh
elif [ "$PLATFORM"x = "android"x ]; then elif [ "$PLATFORM"x = "android"x ]; then