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

[Travis CI] Using linux by default. [ci skip]

This commit is contained in:
James Chen 2013-05-21 17:29:23 +08:00
parent e4755fec24
commit 13f50b2072
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/travis-scripts/before-install.sh
View File

@ -13,10 +13,10 @@ pushd $HOME/bin
install_android_ndk()
{
# Download android ndk
if [ "$PLATFORM"x = "android"x ]; then
HOST_NAME="linux"
elif [ "$PLATFORM"x = "ios"x ]; then
if [ "$PLATFORM"x = "ios"x ]; then
HOST_NAME="darwin"
else
HOST_NAME="linux"
fi
echo "Download android-ndk-r8e-${HOST_NAME}-x86_64.tar.bz2 ..."
curl -O http://dl.google.com/android/ndk/android-ndk-r8e-${HOST_NAME}-x86_64.tar.bz2
@ -28,10 +28,10 @@ install_android_ndk()
install_llvm()
{
if [ "$PLATFORM"x = "android"x ]; then
HOST_NAME="linux-ubuntu_12.04"
elif [ "$PLATFORM"x = "ios"x ]; then
if [ "$PLATFORM"x = "ios"x ]; then
HOST_NAME="apple-darwin11"
else
HOST_NAME="linux-ubuntu_12.04"
fi
# Download llvm3.1
echo "Download clang+llvm-3.1-x86_64-${HOST_NAME}.tar.gz"

2
tools/travis-scripts/generate-jsbindings.sh
View File

@ -38,7 +38,7 @@ if [ "$PLATFORM"x = "ios"x ]; then
cd Cheetah-2.4.4
sudo python setup.py install 2> /dev/null > /dev/null
popd
elif [ "$PLATFORM"x = "android"x ]; then
else
sudo apt-get --force-yes --yes install python-yaml python-cheetah
fi