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

Merge pull request #1518 from dumganhar/gles20 

Updated jenkins_scripts/mac/android/generate-js-cxx-bindings.sh.
This commit is contained in:
James Chen 2012-10-30 02:56:01 -07:00
parent 4d8f1aa678 1538ad4e78
commit 0f69da10b2
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/jenkins_scripts/mac/android/generate-js-cxx-bindings.sh
View File

@ -35,17 +35,19 @@ if [ -z "${HUB+aaa}" ]; then
HUB="$HOME/bin/hub"
fi
# Update local repo
pushd "$COCOS2DX_ROOT"
# Update cocos2d-x repo
# It needs to be updated in Jenkins command before executing this script.
#pushd "$COCOS2DX_ROOT"
git checkout -f
git checkout gles20
git pull upstream gles20
rm -rf "$GENERATED_WORKTREE"
git submodule update --init
#git checkout -f
#git checkout gles20
#git pull upstream gles20
#rm -rf "$GENERATED_WORKTREE"
#git submodule update --init
popd
#popd
# Update submodule of auto-gen JSBinding repo.
pushd "$GENERATED_WORKTREE"
git checkout -f