From 7c283ccd633a5ec2c63a0c0aebf0117a5c79b84b Mon Sep 17 00:00:00 2001 From: zilongshanren Date: Wed, 11 May 2016 11:02:08 +0800 Subject: [PATCH] fix gen bindings and cocos files script --- native/tools/travis-scripts/generate-bindings.sh | 9 ++------- native/tools/travis-scripts/generate-cocosfiles.sh | 5 +---- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/native/tools/travis-scripts/generate-bindings.sh b/native/tools/travis-scripts/generate-bindings.sh index 1db2a81bcf..639c46a653 100755 --- a/native/tools/travis-scripts/generate-bindings.sh +++ b/native/tools/travis-scripts/generate-bindings.sh @@ -29,7 +29,7 @@ JS_COMMIT_PATH="cocos/scripting/js-bindings/auto" # Exit on error set -e -if [ "$PLATFORM"x = "mac-ios"x ]; then +if [ $TRAVIS_OS_NAME == 'osx' ]; then mkdir -p $HOME/bin pushd $HOME/bin curl -O http://pyyaml.org/download/pyyaml/PyYAML-3.10.zip @@ -42,8 +42,6 @@ if [ "$PLATFORM"x = "mac-ios"x ]; then cd Cheetah-2.4.4 sudo python setup.py install 2> /dev/null > /dev/null popd -elif [ $(command -v apt-get) ]; then - sudo apt-get --force-yes --yes install python-yaml python-cheetah fi generate_bindings_glue_codes() @@ -54,10 +52,7 @@ generate_bindings_glue_codes() popd } -if [ "$GEN_BINDING"x != "YES"x ]; then - generate_bindings_glue_codes - exit 0 -fi +generate_bindings_glue_codes pushd "$PROJECT_ROOT" #Set git user for cocos2d-js repo diff --git a/native/tools/travis-scripts/generate-cocosfiles.sh b/native/tools/travis-scripts/generate-cocosfiles.sh index d03585d7f8..94b3d4b335 100755 --- a/native/tools/travis-scripts/generate-cocosfiles.sh +++ b/native/tools/travis-scripts/generate-cocosfiles.sh @@ -18,10 +18,7 @@ generate_cocosfiles_json() ./generate-template-files.py } -if [ "$GEN_COCOS_FILES"x != "YES"x ]; then - generate_cocosfiles_json - exit 0 -fi +generate_cocosfiles_json pushd "$PROJECT_ROOT" #Set git user for cocos2d-x repo