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

CHANGELOG.REMOVED.git-id

@@ -1 +1 @@
-874372f8d3779318a2f70b74984575e632ff0dc8
+936b6bad063ed7529710ca0edf9290b051097b23

cocos/base/CCConsole.cpp

@@ -252,6 +252,8 @@ Console::Console()
 , _running(false)
 , _endThread(false)
 , _sendDebugStrings(false)
+,_fileUploading(false)
+,_uploadFileSize(0)
 {
     // VS2012 doesn't support initializer list, so we create a new array and assign its elements to '_command'.
 	Command commands[] = {     
@@ -290,6 +292,7 @@ Console::Console()
 	{
 		_commands.insert ( std::pair<std::string,Command>(commands[i].name,commands[i]) );
 	}
+	_writablePath = FileUtils::getInstance()->getWritablePath();
 }
 
 Console::~Console()
@@ -759,9 +762,9 @@ void Console::commandUpload(int fd, const std::string& args)
     auto argv = split(args,' ');
     if(argv.size() == 2)
     {
-        _upload_file_name = argv[0];
-        _upload_file_size = std::atoi(argv[1].c_str());
-        _file_uploading = true;        
+        _uploadFileName = argv[0];
+        _uploadFileSize = std::atoi(argv[1].c_str());
+        _fileUploading = true;        
     }
     else 
     {
@@ -853,10 +856,7 @@ ssize_t Console::readfile(int fd, std::string& file_name, int file_size)
     ssize_t n, rc;
     char c;
 
-    auto sharedFileUtils = FileUtils::getInstance();
-    
-    std::string writablePath = sharedFileUtils->getWritablePath();
-    std::string fileName = writablePath+file_name;
+    std::string fileName = _writablePath+file_name;
     
     FILE* fp = fopen(fileName.c_str(), "wb");
     if(!fp)
@@ -970,7 +970,7 @@ void Console::loop()
             for(const auto &fd: _fds) {
                 if(FD_ISSET(fd,&copy_set)) 
                 {
-                    if(!_file_uploading)
+                    if(!_fileUploading)
                     {
                         if( ! parseCommand(fd) )
                         {
@@ -979,8 +979,8 @@ void Console::loop()
                     }
                     else
                     {
-                        readfile(fd, _upload_file_name, _upload_file_size);
-                        _file_uploading = false;
+                        readfile(fd, _uploadFileName, _uploadFileSize);
+                        _fileUploading = false;
 
                     }
                     if(--nready <= 0)

cocos/base/CCConsole.h

@@ -128,9 +128,10 @@ protected:
     bool _running;
     bool _endThread;
 
-    bool _file_uploading;
-    ssize_t _upload_file_size;
-    std::string _upload_file_name;
+    bool _fileUploading;
+    ssize_t _uploadFileSize;
+    std::string _uploadFileName;
+    std::string _writablePath;
 
     std::map<std::string, Command> _commands;
 

templates/lua-template-runtime/frameworks/runtime-src/Classes/Runtime.cpp

@@ -363,7 +363,7 @@ bool CreateDir(const char *sPathName)
 bool FileServer::recv_file(int fd)
 {
 	char buffer[1024]={0};
-    char namelen[4]={0};
+    char namelen[5]={0};
 	if (recv(fd, namelen, 4,0)<=0) {
 		return  false;
 	}

tools/cocos2d-console

@@ -1 +1 @@
-Subproject commit e06b610aa7bb1b5357f0700f1370ea64f9cb4b83
+Subproject commit 79fa77ec132d6037f35110bde66fb882d82eb0de

tools/jenkins-scripts/autotest.py

@@ -1,3 +1,4 @@
+#!/usr/bin/python
 import os
 import sys
 import subprocess
@@ -25,7 +26,7 @@ def autotest(type):
 		soc.connect((HOST_ADNROID, PORT))
 	if type == TYPE_IOS:
 		soc.connect((HOST_IOS, PORT))
-	time.sleep(3)
+	time.sleep(1)
 	print 'autotest run:'
 	soc.send('autotest run\r\n')
 
@@ -65,8 +66,8 @@ def MAC_BUILD():
 		if not cleanProj():
 			print '**CLEAN FAILED**'
 		if not buildProj():
-			cleanProj()
-			buildProj()
+			print '**BUILD FAILED**'
+			return False
 		if not openProj():
 			return False
 		time.sleep(sleep_time)
@@ -118,8 +119,10 @@ def ANDROID_BUILD():
 #----------------autotest-android build and run end----------------#
 
 def main():
+	print 'will build mac project.'
 	suc_build_mac = MAC_BUILD()
-	suc_build_android = ANDROID_BUILD()
+	#print 'will build android project.'
+	#suc_build_android = ANDROID_BUILD()
 	if suc_build_mac:
 		autotest(TYPE_MAC)
 	if suc_build_android: