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

Merge pull request #2559 from dumganhar/master 

fixed #2105: Refactoring travis build script for android.
This commit is contained in:
James Chen 2013-05-13 05:45:15 -07:00
parent 8ab1c84f7a 1aad7e927d
commit 32cbb28ba9
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -14,9 +14,7 @@ env:
# - GEN_JSB=YES # - GEN_JSB=YES
- PLATFORM=linux DEBUG=1 - PLATFORM=linux DEBUG=1
- PLATFORM=nacl DEBUG=1 - PLATFORM=nacl DEBUG=1
- PLATFORM=android SAMPLE_LANG=Cpp APPNAME=HelloCpp - PLATFORM=android
- PLATFORM=android SAMPLE_LANG=Javascript APPNAME=TestJavascript
- PLATFORM=android SAMPLE_LANG=Lua APPNAME=TestLua
branches: branches:
only: only:
- master - master

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

@ -13,9 +13,16 @@ if [ "$GEN_JSB"x = "YES"x ]; then
./generate-jsbindings.sh ./generate-jsbindings.sh
fi fi
if [ "$PLATFORM"x = "android"x ]; then build_android()
cd $COCOS2DX_ROOT/samples/$SAMPLE_LANG/$APPNAME/proj.android {
cd $COCOS2DX_ROOT/samples/$1/$2/proj.android
./build_native.sh ./build_native.sh
}
if [ "$PLATFORM"x = "android"x ]; then
build_android Cpp HelloCpp
build_android Javascript TestJavascript
build_android Lua TestLua
fi fi
if [ "$PLATFORM"x = "nacl"x ]; then if [ "$PLATFORM"x = "nacl"x ]; then