Replaced JSON template configuration file with YAML equivalent (bloom.template.json -> bloom.template.yaml)
This commit is contained in:
@@ -72,7 +72,7 @@ qt_add_resources(
|
||||
PREFIX
|
||||
"/compiled"
|
||||
FILES
|
||||
"./resources/bloom.template.json"
|
||||
"./resources/bloom.template.yaml"
|
||||
"./resources/help.txt"
|
||||
"./resources/gdbHelpMonitorInfo.txt"
|
||||
)
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
{
|
||||
"environments": {
|
||||
"default": {
|
||||
"debugTool": {
|
||||
"name": "atmel-ice",
|
||||
"releasePostDebugSession": true
|
||||
},
|
||||
|
||||
"target": {
|
||||
"name": "avr8",
|
||||
"physicalInterface": "debug-wire"
|
||||
},
|
||||
|
||||
"debugServer": {
|
||||
"name": "avr-gdb-rsp",
|
||||
"ipAddress": "127.0.0.1",
|
||||
"port": "1442"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
"insight": {
|
||||
"enabled": true
|
||||
}
|
||||
}
|
||||
17
resources/bloom.template.yaml
Normal file
17
resources/bloom.template.yaml
Normal file
@@ -0,0 +1,17 @@
|
||||
environments:
|
||||
default:
|
||||
debugTool:
|
||||
name: "atmel-ice"
|
||||
releasePostDebugSession: true
|
||||
|
||||
target:
|
||||
name: "avr8"
|
||||
physicalInterface: "debug-wire"
|
||||
|
||||
debugServer:
|
||||
name: "avr-gdb-rsp"
|
||||
ipAddress: "127.0.0.1"
|
||||
port: 1442
|
||||
|
||||
insight:
|
||||
enabled: true
|
||||
@@ -341,13 +341,13 @@ namespace Bloom
|
||||
}
|
||||
|
||||
/*
|
||||
* The file bloom.template.json is just a template Bloom config file that is included in the binary image as
|
||||
* a resource. See src/resource.qrc
|
||||
* The file bloom.template.yaml is just a template Bloom config file that is included in the binary image as
|
||||
* a resource. See the root-level CMakeLists.txt for more.
|
||||
*
|
||||
* We simply copy the template file into the user's working directory.
|
||||
*/
|
||||
auto templateConfigFile = QFile(
|
||||
QString::fromStdString(Paths::compiledResourcesPath()+ "/resources/bloom.template.json")
|
||||
QString::fromStdString(Paths::compiledResourcesPath()+ "/resources/bloom.template.yaml")
|
||||
);
|
||||
|
||||
if (!templateConfigFile.open(QIODevice::ReadOnly)) {
|
||||
|
||||
Reference in New Issue
Block a user