Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue4863

This commit is contained in:
zhangbin 2014-04-17 17:19:57 +08:00
commit 0e14c2ad3f
3 changed files with 7 additions and 0 deletions

View File

@ -82,6 +82,8 @@ EventListenerTouchOneByOne* EventListenerTouchOneByOne::create()
bool EventListenerTouchOneByOne::checkAvailable() bool EventListenerTouchOneByOne::checkAvailable()
{ {
// EventDispatcher will use the return value of 'onTouchBegan' to determine whether to pass following 'move', 'end'
// message to 'EventListenerTouchOneByOne' or not. So 'onTouchBegan' needs to be set.
if (onTouchBegan == nullptr) if (onTouchBegan == nullptr)
{ {
CCASSERT(false, "Invalid EventListenerTouchOneByOne!"); CCASSERT(false, "Invalid EventListenerTouchOneByOne!");

View File

@ -146,6 +146,11 @@ def main():
data = codecs.open(modify_file, encoding='UTF-8').read() data = codecs.open(modify_file, encoding='UTF-8').read()
data = re.sub("director->setDisplayStats\(true\);", "director->setDisplayStats(true); director->getConsole()->listenOnTCP(5678);", data) data = re.sub("director->setDisplayStats\(true\);", "director->setDisplayStats(true); director->getConsole()->listenOnTCP(5678);", data)
codecs.open(modify_file, 'wb', encoding='UTF-8').write(data) codecs.open(modify_file, 'wb', encoding='UTF-8').write(data)
#modify tests/cpp-empty-test/proj.android/AndroidManifest.xml to support Console
modify_file = 'tests/cpp-empty-test/proj.android/AndroidManifest.xml'
data = codecs.open(modify_file, encoding='UTF-8').read()
data = re.sub('<uses-feature android:glEsVersion="0x00020000" />', '<uses-feature android:glEsVersion="0x00020000" /> <uses-permission android:name="android.permission.INTERNET"/>', data)
codecs.open(modify_file, 'wb', encoding='UTF-8').write(data)
print "Start build android..." print "Start build android..."
ret = os.system("python build/android-build.py -n -j10 all") ret = os.system("python build/android-build.py -n -j10 all")
# create and save apk # create and save apk

0
tools/jenkins-scripts/upload_apk.sh Normal file → Executable file
View File