diff --git a/cocos/2d/CCEventListenerTouch.cpp b/cocos/2d/CCEventListenerTouch.cpp index 2dbbbe8d41..4730cc7f60 100644 --- a/cocos/2d/CCEventListenerTouch.cpp +++ b/cocos/2d/CCEventListenerTouch.cpp @@ -82,6 +82,8 @@ EventListenerTouchOneByOne* EventListenerTouchOneByOne::create() 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) { CCASSERT(false, "Invalid EventListenerTouchOneByOne!"); diff --git a/tools/jenkins-scripts/pull-request-builder.py b/tools/jenkins-scripts/pull-request-builder.py index ea2e86c887..a77ac64c70 100755 --- a/tools/jenkins-scripts/pull-request-builder.py +++ b/tools/jenkins-scripts/pull-request-builder.py @@ -146,6 +146,11 @@ def main(): data = codecs.open(modify_file, encoding='UTF-8').read() data = re.sub("director->setDisplayStats\(true\);", "director->setDisplayStats(true); director->getConsole()->listenOnTCP(5678);", 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('', ' ', data) + codecs.open(modify_file, 'wb', encoding='UTF-8').write(data) print "Start build android..." ret = os.system("python build/android-build.py -n -j10 all") # create and save apk diff --git a/tools/jenkins-scripts/upload_apk.sh b/tools/jenkins-scripts/upload_apk.sh old mode 100644 new mode 100755