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

fix simulator compile error

This commit is contained in:
yinjimmy 2015-06-03 22:58:25 +08:00
parent 883f250f6a
commit b1e40a98b0
4 changed files with 53 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/simulator/frameworks/runtime-src/Classes/ide-support/RuntimeJsImpl.cpp
View File

@ -239,11 +239,14 @@ void RuntimeJsImpl::onPrecompile(const rapidjson::Document& dArgParse, rapidjson
void RuntimeJsImpl::onReload(const rapidjson::Document &dArgParse, rapidjson::Document &dReplyParse) void RuntimeJsImpl::onReload(const rapidjson::Document &dArgParse, rapidjson::Document &dReplyParse)
{ {
if (dArgParse.HasMember("modulefiles")){ if (dArgParse.HasMember("modulefiles")){
auto& allocator = dReplyParse.GetAllocator();
rapidjson::Value bodyvalue(rapidjson::kObjectType); rapidjson::Value bodyvalue(rapidjson::kObjectType);
const rapidjson::Value& objectfiles = dArgParse["modulefiles"]; const rapidjson::Value& objectfiles = dArgParse["modulefiles"];
for (rapidjson::SizeType i = 0; i < objectfiles.Size(); i++){ for (rapidjson::SizeType i = 0; i < objectfiles.Size(); i++){
if (!reloadScript(objectfiles[i].GetString())) { if (!reloadScript(objectfiles[i].GetString())) {
bodyvalue.AddMember(objectfiles[i].GetString(),1,dReplyParse.GetAllocator()); bodyvalue.AddMember(rapidjson::Value(objectfiles[i].GetString(), allocator)
, rapidjson::Value(1)
, allocator);
} }
} }
if (0 == objectfiles.Size()) if (0 == objectfiles.Size())

5
tools/simulator/frameworks/runtime-src/Classes/ide-support/RuntimeLuaImpl.cpp
View File

@ -268,13 +268,16 @@ void RuntimeLuaImpl::onReload(const rapidjson::Document &dArgParse, rapidjson::D
// lua // lua
if (dArgParse.HasMember("modulefiles")) if (dArgParse.HasMember("modulefiles"))
{ {
auto& allocator = dReplyParse.GetAllocator();
rapidjson::Value bodyvalue(rapidjson::kObjectType); rapidjson::Value bodyvalue(rapidjson::kObjectType);
const rapidjson::Value& objectfiles = dArgParse["modulefiles"]; const rapidjson::Value& objectfiles = dArgParse["modulefiles"];
for (rapidjson::SizeType i = 0; i < objectfiles.Size(); i++) for (rapidjson::SizeType i = 0; i < objectfiles.Size(); i++)
{ {
if (!reloadScript(objectfiles[i].GetString())) if (!reloadScript(objectfiles[i].GetString()))
{ {
bodyvalue.AddMember(objectfiles[i].GetString(), 1, dReplyParse.GetAllocator()); bodyvalue.AddMember(rapidjson::Value(objectfiles[i].GetString(), allocator)
, rapidjson::Value(1)
, allocator);
} }
} }
if (0 == objectfiles.Size()) if (0 == objectfiles.Size())

76
tools/simulator/libsimulator/lib/runtime/ConsoleCommand.cpp
View File

@ -83,10 +83,12 @@ void ConsoleCommand::onSendCommand(int fd, const std::string &args)
rapidjson::Document dReplyParse; rapidjson::Document dReplyParse;
dReplyParse.SetObject(); dReplyParse.SetObject();
dReplyParse.AddMember("cmd",strcmd.c_str(),dReplyParse.GetAllocator()); rapidjson::Document::AllocatorType& allocator = dReplyParse.GetAllocator();
dReplyParse.AddMember("cmd", rapidjson::Value(strcmd.c_str(), allocator)
, allocator);
if (dArgParse.HasMember("seq")) if (dArgParse.HasMember("seq"))
{ {
dReplyParse.AddMember("seq",dArgParse["seq"],dReplyParse.GetAllocator()); dReplyParse.AddMember("seq",dArgParse["seq"],allocator);
} }
if(strcmp(strcmd.c_str(), "start-logic") == 0) if(strcmp(strcmd.c_str(), "start-logic") == 0)
@ -128,36 +130,40 @@ void ConsoleCommand::onSendCommand(int fd, const std::string &args)
} else if(strcmp(strcmd.c_str(), "getversion") == 0) } else if(strcmp(strcmd.c_str(), "getversion") == 0)
{ {
rapidjson::Value bodyvalue(rapidjson::kObjectType); rapidjson::Value bodyvalue(rapidjson::kObjectType);
bodyvalue.AddMember("version", getRuntimeVersion(), dReplyParse.GetAllocator()); bodyvalue.AddMember("version", rapidjson::Value(getRuntimeVersion(), allocator)
dReplyParse.AddMember("body", bodyvalue, dReplyParse.GetAllocator()); , allocator);
dReplyParse.AddMember("code", 0, dReplyParse.GetAllocator()); dReplyParse.AddMember("body", bodyvalue, allocator);
dReplyParse.AddMember("code", 0, allocator);
} else if(strcmp(strcmd.c_str(), "getfileinfo") == 0) } else if(strcmp(strcmd.c_str(), "getfileinfo") == 0)
{ {
rapidjson::Value bodyvalue(rapidjson::kObjectType); rapidjson::Value bodyvalue(rapidjson::kObjectType);
rapidjson::Document* filecfgjson = _fileserver->getFileCfgJson(); rapidjson::Document* filecfgjson = _fileserver->getFileCfgJson();
for (auto it = filecfgjson->MemberonBegin(); it != filecfgjson->MemberonEnd(); ++it) for (rapidjson::Value::MemberIterator itr = filecfgjson->MemberBegin()
; itr != filecfgjson->MemberEnd()
; ++itr)
{ {
bodyvalue.AddMember(it->name.GetString(), it->value.GetString(), dReplyParse.GetAllocator()); bodyvalue.AddMember(itr->name, itr->value, allocator);
} }
dReplyParse.AddMember("body", bodyvalue, dReplyParse.GetAllocator());
dReplyParse.AddMember("code", 0, dReplyParse.GetAllocator()); dReplyParse.AddMember("body", bodyvalue, allocator);
dReplyParse.AddMember("code", 0, allocator);
} else if (strcmp(strcmd.c_str(), "getEntryfile") == 0) } else if (strcmp(strcmd.c_str(), "getEntryfile") == 0)
{ {
rapidjson::Value bodyvalue(rapidjson::kObjectType); rapidjson::Value bodyvalue(rapidjson::kObjectType);
rapidjson::Value entryFileValue(rapidjson::kStringType); rapidjson::Value entryFileValue(rapidjson::kStringType);
entryFileValue.SetString(ConfigParser::getInstance()->getEntryFile().c_str(), dReplyParse.GetAllocator()); entryFileValue.SetString(ConfigParser::getInstance()->getEntryFile().c_str(), allocator);
bodyvalue.AddMember("entryfile", entryFileValue, dReplyParse.GetAllocator()); bodyvalue.AddMember("entryfile", entryFileValue, allocator);
dReplyParse.AddMember("body", bodyvalue,dReplyParse.GetAllocator()); dReplyParse.AddMember("body", bodyvalue,allocator);
dReplyParse.AddMember("code", 0, dReplyParse.GetAllocator()); dReplyParse.AddMember("code", 0, allocator);
} else if(strcmp(strcmd.c_str(), "getIP") == 0) } else if(strcmp(strcmd.c_str(), "getIP") == 0)
{ {
rapidjson::Value bodyvalue(rapidjson::kObjectType); rapidjson::Value bodyvalue(rapidjson::kObjectType);
rapidjson::Value IPValue(rapidjson::kStringType); rapidjson::Value IPValue(rapidjson::kStringType);
IPValue.SetString(getIPAddress().c_str(), dReplyParse.GetAllocator()); IPValue.SetString(getIPAddress().c_str(), allocator);
bodyvalue.AddMember("IP", IPValue,dReplyParse.GetAllocator()); bodyvalue.AddMember("IP", IPValue,allocator);
dReplyParse.AddMember("body", bodyvalue,dReplyParse.GetAllocator()); dReplyParse.AddMember("body", bodyvalue,allocator);
dReplyParse.AddMember("code", 0, dReplyParse.GetAllocator()); dReplyParse.AddMember("code", 0, allocator);
} else if(strcmp(strcmd.c_str(), "remove") == 0) } else if(strcmp(strcmd.c_str(), "remove") == 0)
{ {
@ -181,12 +187,16 @@ void ConsoleCommand::onSendCommand(int fd, const std::string &args)
if(remove(filepath.c_str()) != 0) if(remove(filepath.c_str()) != 0)
{ {
// remove failed // remove failed
bodyvalue.AddMember(filename, 2, dReplyParse.GetAllocator()); bodyvalue.AddMember(rapidjson::Value(filename, allocator)
, rapidjson::Value(2)
, allocator);
} }
} else } else
{ {
// file not exist // file not exist
bodyvalue.AddMember(filename, 1, dReplyParse.GetAllocator()); bodyvalue.AddMember(rapidjson::Value(filename, allocator)
, rapidjson::Value(1)
, allocator);
} }
// file remove success, remove it from record // file remove success, remove it from record
@ -194,10 +204,10 @@ void ConsoleCommand::onSendCommand(int fd, const std::string &args)
_fileserver->removeResFileInfo(filename); _fileserver->removeResFileInfo(filename);
} }
dReplyParse.AddMember("body", bodyvalue, dReplyParse.GetAllocator()); dReplyParse.AddMember("body", bodyvalue, allocator);
} }
dReplyParse.AddMember("code",0,dReplyParse.GetAllocator()); dReplyParse.AddMember("code",0,allocator);
} else if(strcmp(strcmd.c_str(), "shutdownapp") == 0) } else if(strcmp(strcmd.c_str(), "shutdownapp") == 0)
{ {
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
@ -220,10 +230,10 @@ void ConsoleCommand::onSendCommand(int fd, const std::string &args)
#endif #endif
rapidjson::Value bodyvalue(rapidjson::kObjectType); rapidjson::Value bodyvalue(rapidjson::kObjectType);
rapidjson::Value platformValue(rapidjson::kStringType); rapidjson::Value platformValue(rapidjson::kStringType);
platformValue.SetString(platform.c_str(), dReplyParse.GetAllocator()); platformValue.SetString(platform.c_str(), allocator);
bodyvalue.AddMember("platform", platformValue, dReplyParse.GetAllocator()); bodyvalue.AddMember("platform", platformValue, allocator);
dReplyParse.AddMember("body", bodyvalue, dReplyParse.GetAllocator()); dReplyParse.AddMember("body", bodyvalue, allocator);
dReplyParse.AddMember("code", 0, dReplyParse.GetAllocator()); dReplyParse.AddMember("code", 0, allocator);
} else if(strcmp(strcmd.c_str(), "usewritablepath") == 0) } else if(strcmp(strcmd.c_str(), "usewritablepath") == 0)
{ {
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
@ -235,7 +245,7 @@ void ConsoleCommand::onSendCommand(int fd, const std::string &args)
FileUtils::getInstance()->setSearchPaths(searchPathArray); FileUtils::getInstance()->setSearchPaths(searchPathArray);
#endif #endif
dReplyParse.AddMember("code", 0, dReplyParse.GetAllocator()); dReplyParse.AddMember("code", 0, allocator);
} }
else if (strcmp(strcmd.c_str(), "workdir") == 0) else if (strcmp(strcmd.c_str(), "workdir") == 0)
{ {
@ -245,10 +255,11 @@ void ConsoleCommand::onSendCommand(int fd, const std::string &args)
FileUtils::getInstance()->setDefaultResourceRootPath(objectPath.GetString()); FileUtils::getInstance()->setDefaultResourceRootPath(objectPath.GetString());
rapidjson::Value bodyvalue(rapidjson::kObjectType); rapidjson::Value bodyvalue(rapidjson::kObjectType);
bodyvalue.AddMember("path", objectPath.GetString(), dReplyParse.GetAllocator()); bodyvalue.AddMember("path", rapidjson::Value(objectPath.GetString(), allocator)
dReplyParse.AddMember("body", bodyvalue, dReplyParse.GetAllocator()); , allocator);
dReplyParse.AddMember("body", bodyvalue, allocator);
} }
dReplyParse.AddMember("code", 0, dReplyParse.GetAllocator()); dReplyParse.AddMember("code", 0, allocator);
} }
else if (strcmp(strcmd.c_str(), "writablePath") == 0) else if (strcmp(strcmd.c_str(), "writablePath") == 0)
{ {
@ -258,10 +269,11 @@ void ConsoleCommand::onSendCommand(int fd, const std::string &args)
FileUtils::getInstance()->setWritablePath(objectPath.GetString()); FileUtils::getInstance()->setWritablePath(objectPath.GetString());
rapidjson::Value bodyvalue(rapidjson::kObjectType); rapidjson::Value bodyvalue(rapidjson::kObjectType);
bodyvalue.AddMember("path", objectPath.GetString(), dReplyParse.GetAllocator()); bodyvalue.AddMember("path", rapidjson::Value(objectPath.GetString(), allocator)
dReplyParse.AddMember("body", bodyvalue, dReplyParse.GetAllocator()); , allocator);
dReplyParse.AddMember("body", bodyvalue, allocator);
} }
dReplyParse.AddMember("code", 0, dReplyParse.GetAllocator()); dReplyParse.AddMember("code", 0, allocator);
} }
rapidjson::StringBuffer buffer; rapidjson::StringBuffer buffer;

2
tools/simulator/libsimulator/lib/runtime/FileServer.cpp
View File

@ -95,7 +95,7 @@ void FileServer::addResFileInfo(const char* filename, uint64_t u64)
filetimeValue.SetString(filetime, _filecfgjson.GetAllocator()); filetimeValue.SetString(filetime, _filecfgjson.GetAllocator());
rapidjson::Value filenameValue(rapidjson::kStringType); rapidjson::Value filenameValue(rapidjson::kStringType);
filenameValue.SetString(filename,_filecfgjson.GetAllocator()); filenameValue.SetString(filename,_filecfgjson.GetAllocator());
_filecfgjson.AddMember(filenameValue.GetString(), filetimeValue, _filecfgjson.GetAllocator()); _filecfgjson.AddMember(filenameValue, filetimeValue, _filecfgjson.GetAllocator());
} }
void FileServer::removeResFileInfo(const char *filename) void FileServer::removeResFileInfo(const char *filename)