Merge pull request #80 from zilongshanren/change-travis-secure-owner

fix gen bindings and cocos files script
This commit is contained in:
zilongshanren
2016-05-11 11:08:24 +08:00
2 changed files with 3 additions and 11 deletions
@@ -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
@@ -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