Skip to content

Commit

Permalink
Replace config variables with env variables
Browse files Browse the repository at this point in the history
  • Loading branch information
@radurentea
radurentea committed May 3, 2022
1 parent b0222fc commit 1cee854
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 31 deletions.
16 changes: 8 additions & 8 deletions testFiles/gcov/.vscode/c_cpp_properties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
"cStandard": "c11",
"cppStandard": "c++17",
"includePath": [
"${config:idf.espIdfPath}/components/**",
"${config:idf.espIdfPathWin}/components/**",
"${config:idf.espAdfPath}/components/**",
"${config:idf.espAdfPathWin}/components/**",
"${env:idf.espIdfPath}/components/**",
"${env:idf.espIdfPathWin}/components/**",
"${env:idf.espAdfPath}/components/**",
"${env:idf.espAdfPathWin}/components/**",
"${workspaceFolder}/**"
],
"browse": {
"path": [
"${config:idf.espIdfPath}/components",
"${config:idf.espIdfPathWin}/components",
"${config:idf.espAdfPath}/components/**",
"${config:idf.espAdfPathWin}/components/**",
"${env:idf.espIdfPath}/components",
"${env:idf.espIdfPathWin}/components",
"${env:idf.espAdfPath}/components/**",
"${env:idf.espAdfPathWin}/components/**",
"${workspaceFolder}"
],
"limitSymbolsToIncludedHeaders": false
Expand Down
46 changes: 23 additions & 23 deletions testFiles/gcov/.vscode/tasks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
{
"label": "Build - Build project",
"type": "shell",
"command": "${config:idf.pythonBinPath} ${config:idf.espIdfPath}/tools/idf.py build",
"command": "${env:idf.pythonBinPath} ${env:idf.espIdfPath}/tools/idf.py build",
"windows": {
"command": "${config:idf.pythonBinPathWin} ${config:idf.espIdfPathWin}\\tools\\idf.py build",
"command": "${env:idf.pythonBinPathWin} ${env:idf.espIdfPathWin}\\tools\\idf.py build",
"options": {
"env": {
"PATH": "${env:PATH};${config:idf.customExtraPaths}"
"PATH": "${env:PATH};${env:idf.customExtraPaths}"
}
}
},
"options": {
"env": {
"PATH": "${env:PATH}:${config:idf.customExtraPaths}"
"PATH": "${env:PATH}:${env:idf.customExtraPaths}"
}
},
"problemMatcher": [
Expand Down Expand Up @@ -72,18 +72,18 @@
{
"label": "Clean - Clean the project",
"type": "shell",
"command": "${config:idf.pythonBinPath} ${config:idf.espIdfPath}/tools/idf.py fullclean",
"command": "${env:idf.pythonBinPath} ${env:idf.espIdfPath}/tools/idf.py fullclean",
"windows": {
"command": "${config:idf.pythonBinPathWin} ${config:idf.espIdfPathWin}\\tools\\idf.py fullclean",
"command": "${env:idf.pythonBinPathWin} ${env:idf.espIdfPathWin}\\tools\\idf.py fullclean",
"options": {
"env": {
"PATH": "${env:PATH};${config:idf.customExtraPaths}"
"PATH": "${env:PATH};${env:idf.customExtraPaths}"
}
}
},
"options": {
"env": {
"PATH": "${env:PATH}:${config:idf.customExtraPaths}"
"PATH": "${env:PATH}:${env:idf.customExtraPaths}"
}
},
"problemMatcher": [
Expand Down Expand Up @@ -119,18 +119,18 @@
{
"label": "Flash - Flash the device",
"type": "shell",
"command": "${config:idf.pythonBinPath} ${config:idf.espIdfPath}/tools/idf.py -p ${config:idf.port} -b ${config:idf.flashBaudRate} flash",
"command": "${env:idf.pythonBinPath} ${env:idf.espIdfPath}/tools/idf.py -p ${env:idf.port} -b ${env:idf.flashBaudRate} flash",
"windows": {
"command": "${config:idf.pythonBinPathWin} ${config:idf.espIdfPathWin}\\tools\\idf.py flash -p ${config:idf.portWin} -b ${config:idf.flashBaudRate}",
"command": "${env:idf.pythonBinPathWin} ${env:idf.espIdfPathWin}\\tools\\idf.py flash -p ${env:idf.portWin} -b ${env:idf.flashBaudRate}",
"options": {
"env": {
"PATH": "${env:PATH};${config:idf.customExtraPaths}"
"PATH": "${env:PATH};${env:idf.customExtraPaths}"
}
}
},
"options": {
"env": {
"PATH": "${env:PATH}:${config:idf.customExtraPaths}"
"PATH": "${env:PATH}:${env:idf.customExtraPaths}"
}
},
"problemMatcher": [
Expand Down Expand Up @@ -166,18 +166,18 @@
{
"label": "Monitor: Start the monitor",
"type": "shell",
"command": "${config:idf.pythonBinPath} ${config:idf.espIdfPath}/tools/idf.py -p ${config:idf.port} monitor",
"command": "${env:idf.pythonBinPath} ${env:idf.espIdfPath}/tools/idf.py -p ${env:idf.port} monitor",
"windows": {
"command": "${config:idf.pythonBinPathWin} ${config:idf.espIdfPathWin}\\tools\\idf.py -p ${config:idf.portWin} monitor",
"command": "${env:idf.pythonBinPathWin} ${env:idf.espIdfPathWin}\\tools\\idf.py -p ${env:idf.portWin} monitor",
"options": {
"env": {
"PATH": "${env:PATH};${config:idf.customExtraPaths}"
"PATH": "${env:PATH};${env:idf.customExtraPaths}"
}
}
},
"options": {
"env": {
"PATH": "${env:PATH}:${config:idf.customExtraPaths}"
"PATH": "${env:PATH}:${env:idf.customExtraPaths}"
}
},
"problemMatcher": [
Expand Down Expand Up @@ -225,13 +225,13 @@
"command": "openocd.exe -s ${command:espIdf.getOpenOcdScriptValue} ${command:espIdf.getOpenOcdConfigs}",
"options": {
"env": {
"PATH": "${env:PATH};${config:idf.customExtraPaths}"
"PATH": "${env:PATH};${env:idf.customExtraPaths}"
}
}
},
"options": {
"env": {
"PATH": "${env:PATH}:${config:idf.customExtraPaths}"
"PATH": "${env:PATH}:${env:idf.customExtraPaths}"
}
},
"problemMatcher": {
Expand All @@ -250,11 +250,11 @@
{
"label": "adapter",
"type": "shell",
"command": "${config:idf.pythonBinPath}",
"command": "${env:idf.pythonBinPath}",
"isBackground": true,
"options": {
"env": {
"PATH": "${env:PATH}:${config:idf.customExtraPaths}",
"PATH": "${env:PATH}:${env:idf.customExtraPaths}",
"PYTHONPATH": "${command:espIdf.getExtensionPath}/esp_debug_adapter/debug_adapter"
}
},
Expand Down Expand Up @@ -282,15 +282,15 @@
"-ip",
"localhost",
"-dn",
"${config:idf.adapterTargetName}",
"${env:idf.adapterTargetName}",
"-om",
"connect_to_instance"
],
"windows": {
"command": "${config:idf.pythonBinPathWin}",
"command": "${env:idf.pythonBinPathWin}",
"options": {
"env": {
"PATH": "${env:PATH};${config:idf.customExtraPaths}",
"PATH": "${env:PATH};${env:idf.customExtraPaths}",
"PYTHONPATH": "${command:espIdf.getExtensionPath}/esp_debug_adapter/debug_adapter"
}
}
Expand Down

0 comments on commit 1cee854

Please sign in to comment.