doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduced debugTool configuration object (as a replacement for the single debugToolName parameter)

Browse Source
This commit is contained in:
Nav
2021-05-30 16:48:34 +01:00
parent dd1920df19
commit a0b59e3bf7
3 changed files with 74 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/ApplicationConfig.cpp
View File

@@ -49,15 +49,16 @@ void InsightConfig::init(QJsonObject jsonObject) {
}
void EnvironmentConfig::init(std::string name, QJsonObject jsonObject) {
this->name = name;
this->debugToolName = jsonObject.find("debugToolName")->toString().toLower().toStdString();
// Extract target data
if (!jsonObject.contains("target")) {
// Environment has no target data - ignore
throw Exceptions::InvalidConfig("No target configuration provided");
if (!jsonObject.contains("debugTool")) {
throw Exceptions::InvalidConfig("No debug tool configuration provided.");
}
if (!jsonObject.contains("target")) {
throw Exceptions::InvalidConfig("No target configuration provided.");
}
this->name = name;
this->debugToolConfig.init(jsonObject.find("debugTool")->toObject());
this->targetConfig.init(jsonObject.find("target")->toObject());
if (jsonObject.contains("debugServer")) {
@@ -87,6 +88,20 @@ void TargetConfig::init(QJsonObject jsonObject) {
this->jsonObject = jsonObject;
}
void DebugToolConfig::init(QJsonObject jsonObject) {
if (!jsonObject.contains("name")) {
throw Exceptions::InvalidConfig("No debug tool name found.");
}
this->name = jsonObject.find("name")->toString().toLower().toStdString();
if (jsonObject.contains("releasePostDebugSession")) {
this->releasePostDebugSession = jsonObject.find("releasePostDebugSession").value().toBool();
}
this->jsonObject = jsonObject;
}
void DebugServerConfig::init(QJsonObject jsonObject) {
this->name = jsonObject.find("name")->toString().toLower().toStdString();
this->jsonObject = jsonObject;