mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-04 04:40:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

server: factor out json object generation entry points

Browse Source 
Make entry points for these that do not reference the server code.  For
now we leave the "cache" object generation alone because its
implementation interleaves error handling and the format may not
suitable outside a server response.
This commit is contained in:
Brad King
2018-09-21 09:35:28 -04:00
parent fc43492e44
commit aabce52851
1 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
Source/cmServerProtocol.cxx
View File

@@ -550,23 +550,12 @@ cmServerResponse cmServerProtocol1::ProcessCache(
return request.Reply(result); return request.Reply(result);
} }
cmServerResponse cmServerProtocol1::ProcessCMakeInputs( static Json::Value DumpCMakeInputs(const cmake* cm)
const cmServerRequest& request)
{ {
if (this->m_State < STATE_CONFIGURED) {
return request.ReportError("This instance was not yet configured.");
}
const cmake* cm = this->CMakeInstance();
const cmGlobalGenerator* gg = cm->GetGlobalGenerator(); const cmGlobalGenerator* gg = cm->GetGlobalGenerator();
const std::string cmakeRootDir = cmSystemTools::GetCMakeRoot();
const std::string& buildDir = cm->GetHomeOutputDirectory(); const std::string& buildDir = cm->GetHomeOutputDirectory();
const std::string& sourceDir = cm->GetHomeDirectory(); const std::string& sourceDir = cm->GetHomeDirectory();
Json::Value result = Json::objectValue;
result[kSOURCE_DIRECTORY_KEY] = sourceDir;
result[kCMAKE_ROOT_DIRECTORY_KEY] = cmakeRootDir;
std::vector<std::string> internalFiles; std::vector<std::string> internalFiles;
std::vector<std::string> explicitFiles; std::vector<std::string> explicitFiles;
std::vector<std::string> tmpFiles; std::vector<std::string> tmpFiles;
@@ -593,8 +582,24 @@ cmServerResponse cmServerProtocol1::ProcessCMakeInputs(
tmp[kSOURCES_KEY] = fromStringList(tmpFiles); tmp[kSOURCES_KEY] = fromStringList(tmpFiles);
array.append(tmp); array.append(tmp);
result[kBUILD_FILES_KEY] = array; return array;
}
cmServerResponse cmServerProtocol1::ProcessCMakeInputs(
const cmServerRequest& request)
{
if (this->m_State < STATE_CONFIGURED) {
return request.ReportError("This instance was not yet configured.");
}
const cmake* cm = this->CMakeInstance();
const std::string cmakeRootDir = cmSystemTools::GetCMakeRoot();
const std::string& sourceDir = cm->GetHomeDirectory();
Json::Value result = Json::objectValue;
result[kSOURCE_DIRECTORY_KEY] = sourceDir;
result[kCMAKE_ROOT_DIRECTORY_KEY] = cmakeRootDir;
result[kBUILD_FILES_KEY] = DumpCMakeInputs(cm);
return request.Reply(result); return request.Reply(result);
} }
@@ -958,6 +963,13 @@ static Json::Value DumpCTestConfigurationsList(const cmake* cm)
return result; return result;
} }
static Json::Value DumpCTestInfo(const cmake* cm)
{
Json::Value result = Json::objectValue;
result[kCONFIGURATIONS_KEY] = DumpCTestConfigurationsList(cm);
return result;
}
static void GetTargetProperty( static void GetTargetProperty(
cmGeneratorExpressionInterpreter& genexInterpreter, cmGeneratorExpressionInterpreter& genexInterpreter,
cmGeneratorTarget* target, const char* propertyName, cmGeneratorTarget* target, const char* propertyName,
@@ -1256,6 +1268,13 @@ static Json::Value DumpConfigurationsList(const cmake* cm)
return result; return result;
} }
static Json::Value DumpCodeModel(const cmake* cm)
{
Json::Value result = Json::objectValue;
result[kCONFIGURATIONS_KEY] = DumpConfigurationsList(cm);
return result;
}
cmServerResponse cmServerProtocol1::ProcessCodeModel( cmServerResponse cmServerProtocol1::ProcessCodeModel(
const cmServerRequest& request) const cmServerRequest& request)
{ {
@@ -1263,9 +1282,7 @@ cmServerResponse cmServerProtocol1::ProcessCodeModel(
return request.ReportError("No build system was generated yet."); return request.ReportError("No build system was generated yet.");
} }
Json::Value result = Json::objectValue; return request.Reply(DumpCodeModel(this->CMakeInstance()));
result[kCONFIGURATIONS_KEY] = DumpConfigurationsList(this->CMakeInstance());
return request.Reply(result);
} }
cmServerResponse cmServerProtocol1::ProcessCompute( cmServerResponse cmServerProtocol1::ProcessCompute(
@@ -1488,10 +1505,7 @@ cmServerResponse cmServerProtocol1::ProcessCTests(
return request.ReportError("This instance was not yet computed."); return request.ReportError("This instance was not yet computed.");
} }
Json::Value result = Json::objectValue; return request.Reply(DumpCTestInfo(this->CMakeInstance()));
result[kCONFIGURATIONS_KEY] =
DumpCTestConfigurationsList(this->CMakeInstance());
return request.Reply(result);
} }
cmServerProtocol1::GeneratorInformation::GeneratorInformation( cmServerProtocol1::GeneratorInformation::GeneratorInformation(