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

Merge pull request #5485 from dumganhar/develop 

Fix travis build fails.
This commit is contained in:
James Chen 2014-02-27 16:24:21 +08:00
parent c3bcfffc08 7e9a120e25
commit e117687a92
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -1,7 +1,6 @@
language: cpp language: cpp
env: env:
matrix: matrix:
- GEN_COCOS_FILES=YES
- PLATFORM=linux DEBUG=1 CC_COMPILER=gcc CXX_COMPILER=g++ - PLATFORM=linux DEBUG=1 CC_COMPILER=gcc CXX_COMPILER=g++
- PLATFORM=linux DEBUG=1 CC_COMPILER=clang CXX_COMPILER=clang++ - PLATFORM=linux DEBUG=1 CC_COMPILER=clang CXX_COMPILER=clang++
# Since switching to C++11 only the ARM version of the nactive client # Since switching to C++11 only the ARM version of the nactive client

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

@ -20,26 +20,26 @@ if [ "$GEN_COCOS_FILES"x = "YES"x ]; then
fi fi
if [ -z "${GH_EMAIL}" ]; then if [ -z "${GH_EMAIL}" ]; then
echo "GH_EMAIL not set" echo "GH_EMAIL not set"
exit 0 exit 1
fi fi
if [ -z "${GH_USER}" ]; then if [ -z "${GH_USER}" ]; then
echo "GH_USER not set" echo "GH_USER not set"
exit 0 exit 1
fi fi
if [ -z "${GH_PASSWORD}" ]; then if [ -z "${GH_PASSWORD}" ]; then
echo "GH_USER not set" echo "GH_USER not set"
exit 0 exit 1
fi fi
cd $COCOS2DX_ROOT/tools/travis-scripts cd $COCOS2DX_ROOT/tools/travis-scripts
./generate-cocosfiles.sh # ./generate-cocosfiles.sh
elif [ "$PLATFORM"x = "android"x ]; then elif [ "$PLATFORM"x = "android"x ]; then
export NDK_ROOT=$HOME/bin/android-ndk export NDK_ROOT=$HOME/bin/android-ndk
# Generate binding glue codes # Generate binding glue codes
echo "Generating bindings glue codes ..." echo "Generating bindings glue codes ..."
cd $COCOS2DX_ROOT/tools/travis-scripts cd $COCOS2DX_ROOT/tools/travis-scripts
./generate-cocosfiles.sh # ./generate-cocosfiles.sh
cd $COCOS2DX_ROOT cd $COCOS2DX_ROOT
@ -66,7 +66,7 @@ elif [ "$PLATFORM"x = "linux"x ]; then
# Generate binding glue codes # Generate binding glue codes
echo "Generating bindings glue codes ..." echo "Generating bindings glue codes ..."
cd $COCOS2DX_ROOT/tools/travis-scripts cd $COCOS2DX_ROOT/tools/travis-scripts
./generate-cocosfiles.sh # ./generate-cocosfiles.sh
echo "Building cocos2d-x" echo "Building cocos2d-x"
cd $COCOS2DX_ROOT/build cd $COCOS2DX_ROOT/build
@ -79,7 +79,7 @@ elif [ "$PLATFORM"x = "emscripten"x ]; then
# Generate binding glue codes # Generate binding glue codes
echo "Generating bindings glue codes ..." echo "Generating bindings glue codes ..."
cd $COCOS2DX_ROOT/tools/travis-scripts cd $COCOS2DX_ROOT/tools/travis-scripts
./generate-cocosfiles.sh # ./generate-cocosfiles.sh
cd $COCOS2DX_ROOT/build cd $COCOS2DX_ROOT/build
export PYTHON=/usr/bin/python export PYTHON=/usr/bin/python
@ -88,7 +88,7 @@ elif [ "$PLATFORM"x = "emscripten"x ]; then
EMCC_DEBUG=1 make PLATFORM=emscripten -j 8 EMCC_DEBUG=1 make PLATFORM=emscripten -j 8
elif [ "$PLATFORM"x = "ios"x ]; then elif [ "$PLATFORM"x = "ios"x ]; then
cd $COCOS2DX_ROOT/tools/travis-scripts cd $COCOS2DX_ROOT/tools/travis-scripts
./generate-cocosfiles.sh # ./generate-cocosfiles.sh
cd $COCOS2DX_ROOT cd $COCOS2DX_ROOT
xctool/xctool.sh -project samples/Cpp/HelloCpp/proj.ios/HelloCpp.xcodeproj -scheme HelloCpp test xctool/xctool.sh -project samples/Cpp/HelloCpp/proj.ios/HelloCpp.xcodeproj -scheme HelloCpp test