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

server: Rename cmServerProtocol1_0 to cmServerProtocol1

Browse Source 
It will serve additional minor versions.

Suggested-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Ivan Shcherbakov
2017-07-05 21:24:29 -07:00
committed by Brad King
parent 8308803167
commit 4db3227514
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmServer.cxx
View File

@@ -36,7 +36,7 @@ cmServer::cmServer(cmServerConnection* conn, bool supportExperimental)
{
this->Connection->SetServer(this);
// Register supported protocols:
this->RegisterProtocol(new cmServerProtocol1_0);
this->RegisterProtocol(new cmServerProtocol1);
}
cmServer::~cmServer()

34
Source/cmServerProtocol.cxx
View File

@@ -247,7 +247,7 @@ bool cmServerProtocol::DoActivate(const cmServerRequest& /*request*/,
return true;
}
std::pair<int, int> cmServerProtocol1_0::ProtocolVersion() const
std::pair<int, int> cmServerProtocol1::ProtocolVersion() const
{
return std::make_pair(1, 0);
}
@@ -297,8 +297,8 @@ static bool testValue(cmState* state, const std::string& key,
return true;
}
bool cmServerProtocol1_0::DoActivate(const cmServerRequest& request,
std::string* errorMessage)
bool cmServerProtocol1::DoActivate(const cmServerRequest& request,
std::string* errorMessage)
{
std::string sourceDirectory = request.Data[kSOURCE_DIRECTORY_KEY].asString();
const std::string buildDirectory =
@@ -417,8 +417,8 @@ bool cmServerProtocol1_0::DoActivate(const cmServerRequest& request,
return true;
}
void cmServerProtocol1_0::HandleCMakeFileChanges(const std::string& path,
int event, int status)
void cmServerProtocol1::HandleCMakeFileChanges(const std::string& path,
int event, int status)
{
assert(status == 0);
static_cast<void>(status);
@@ -441,7 +441,7 @@ void cmServerProtocol1_0::HandleCMakeFileChanges(const std::string& path,
SendSignal(kFILE_CHANGE_SIGNAL, obj);
}
const cmServerResponse cmServerProtocol1_0::Process(
const cmServerResponse cmServerProtocol1::Process(
const cmServerRequest& request)
{
assert(this->m_State >= STATE_ACTIVE);
@@ -474,12 +474,12 @@ const cmServerResponse cmServerProtocol1_0::Process(
return request.ReportError("Unknown command!");
}
bool cmServerProtocol1_0::IsExperimental() const
bool cmServerProtocol1::IsExperimental() const
{
return true;
}
cmServerResponse cmServerProtocol1_0::ProcessCache(
cmServerResponse cmServerProtocol1::ProcessCache(
const cmServerRequest& request)
{
if (this->m_State < STATE_CONFIGURED) {
@@ -528,7 +528,7 @@ cmServerResponse cmServerProtocol1_0::ProcessCache(
return request.Reply(result);
}
cmServerResponse cmServerProtocol1_0::ProcessCMakeInputs(
cmServerResponse cmServerProtocol1::ProcessCMakeInputs(
const cmServerRequest& request)
{
if (this->m_State < STATE_CONFIGURED) {
@@ -915,7 +915,7 @@ static Json::Value DumpConfigurationsList(const cmake* cm)
return result;
}
cmServerResponse cmServerProtocol1_0::ProcessCodeModel(
cmServerResponse cmServerProtocol1::ProcessCodeModel(
const cmServerRequest& request)
{
if (this->m_State != STATE_COMPUTED) {
@@ -927,7 +927,7 @@ cmServerResponse cmServerProtocol1_0::ProcessCodeModel(
return request.Reply(result);
}
cmServerResponse cmServerProtocol1_0::ProcessCompute(
cmServerResponse cmServerProtocol1::ProcessCompute(
const cmServerRequest& request)
{
if (this->m_State > STATE_CONFIGURED) {
@@ -947,7 +947,7 @@ cmServerResponse cmServerProtocol1_0::ProcessCompute(
return request.Reply(Json::Value());
}
cmServerResponse cmServerProtocol1_0::ProcessConfigure(
cmServerResponse cmServerProtocol1::ProcessConfigure(
const cmServerRequest& request)
{
if (this->m_State == STATE_INACTIVE) {
@@ -1053,7 +1053,7 @@ cmServerResponse cmServerProtocol1_0::ProcessConfigure(
return request.Reply(Json::Value());
}
cmServerResponse cmServerProtocol1_0::ProcessGlobalSettings(
cmServerResponse cmServerProtocol1::ProcessGlobalSettings(
const cmServerRequest& request)
{
cmake* cm = this->CMakeInstance();
@@ -1089,7 +1089,7 @@ static void setBool(const cmServerRequest& request, const std::string& key,
setter(request.Data[key].asBool());
}
cmServerResponse cmServerProtocol1_0::ProcessSetGlobalSettings(
cmServerResponse cmServerProtocol1::ProcessSetGlobalSettings(
const cmServerRequest& request)
{
const std::vector<std::string> boolValues = {
@@ -1121,7 +1121,7 @@ cmServerResponse cmServerProtocol1_0::ProcessSetGlobalSettings(
return request.Reply(Json::Value());
}
cmServerResponse cmServerProtocol1_0::ProcessFileSystemWatchers(
cmServerResponse cmServerProtocol1::ProcessFileSystemWatchers(
const cmServerRequest& request)
{
const cmFileMonitor* const fm = FileMonitor();
@@ -1140,7 +1140,7 @@ cmServerResponse cmServerProtocol1_0::ProcessFileSystemWatchers(
return request.Reply(result);
}
cmServerProtocol1_0::GeneratorInformation::GeneratorInformation(
cmServerProtocol1::GeneratorInformation::GeneratorInformation(
const std::string& generatorName, const std::string& extraGeneratorName,
const std::string& toolset, const std::string& platform,
const std::string& sourceDirectory, const std::string& buildDirectory)
@@ -1153,7 +1153,7 @@ cmServerProtocol1_0::GeneratorInformation::GeneratorInformation(
{
}
void cmServerProtocol1_0::GeneratorInformation::SetupGenerator(
void cmServerProtocol1::GeneratorInformation::SetupGenerator(
cmake* cm, std::string* errorMessage)
{
const std::string fullGeneratorName =

2
Source/cmServerProtocol.h
View File

@@ -98,7 +98,7 @@ private:
friend class cmServer;
};
class cmServerProtocol1_0 : public cmServerProtocol
class cmServerProtocol1 : public cmServerProtocol
{
public:
std::pair<int, int> ProtocolVersion() const override;