microsoft
/
cocos2d-x
зеркало из https://github.com/microsoft/cocos2d-x.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge pull request #5581 from dumganhar/develop 

[travis ci] Uncomments '.generate-cocosfiles.sh'.
This commit is contained in:
James Chen 2014-03-06 14:02:52 +08:00
Родитель 43d85dc0d7 738a4f5deb
Коммит e6e9c5abfb
1 изменённых файлов: 5 добавлений и 5 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
tools/travis-scripts/run-script.sh
Просмотреть файл

@ -32,14 +32,14 @@ if [ "$GEN_COCOS_FILES"x = "YES"x ]; then
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