From 1bf9d6206d94bfe30cb95d1da8146e43f7484af7 Mon Sep 17 00:00:00 2001
From: Rocco Marco Guglielmi <roccomarco.guglielmi@live.com>
Date: Sun, 26 Apr 2020 14:45:20 +0000
Subject: [PATCH] Updated tools/eclipse/debug to be independent from the
 toolchain position: they now rely on the environment variable CHIBISTUDIO

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@13583 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
---
 readme.txt                                                      | 2 ++
 ...D no interface (prompts for .cfg board configuration).launch | 2 +-
 ...enOCD on ICDI (prompts for .cfg target configuration).launch | 2 +-
 ...OCD on STLink (prompts for .cfg target configuration).launch | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/readme.txt b/readme.txt
index f1490f2f9..8ddbe4655 100644
--- a/readme.txt
+++ b/readme.txt
@@ -74,6 +74,8 @@
 *****************************************************************************
 
 *** 20.3.1 ***
+- NEW: Updated debug tools to be independent from the toolchain position:
+       they now rely on the environment variable CHIBISTUDIO.
 - FIX: Sector count incorrect in STM32G07/8 EFL driver (bug #1085).
 - FIX: Sector size incorrect in STM32F413 EFL driver (bug #1084).
 - NEW: Added dynamic reconfiguration API to lwIP bindings.
diff --git a/tools/eclipse/debug/OpenOCD no interface (prompts for .cfg board configuration).launch b/tools/eclipse/debug/OpenOCD no interface (prompts for .cfg board configuration).launch
index 126965e72..edc28c071 100644
--- a/tools/eclipse/debug/OpenOCD no interface (prompts for .cfg board configuration).launch	
+++ b/tools/eclipse/debug/OpenOCD no interface (prompts for .cfg board configuration).launch	
@@ -5,5 +5,5 @@
 </listAttribute>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${env_var:OPENOCD}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-c &quot;telnet_port 4444&quot; -s &quot;/ChibiStudio/tools/openocd/scripts&quot; -f &quot;${file_prompt}&quot;"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-c &quot;telnet_port 4444&quot; -s &quot;${env_var:CHIBISTUDIO}/tools/openocd/scripts&quot; -f &quot;${file_prompt}&quot;"/>
 </launchConfiguration>
diff --git a/tools/eclipse/debug/OpenOCD on ICDI (prompts for .cfg target configuration).launch b/tools/eclipse/debug/OpenOCD on ICDI (prompts for .cfg target configuration).launch
index d4c1268d2..4ff2b55c2 100644
--- a/tools/eclipse/debug/OpenOCD on ICDI (prompts for .cfg target configuration).launch	
+++ b/tools/eclipse/debug/OpenOCD on ICDI (prompts for .cfg target configuration).launch	
@@ -5,5 +5,5 @@
 </listAttribute>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${env_var:OPENOCD}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-c &quot;telnet_port 4444&quot; -f &quot;interface/ti-icdi.cfg&quot; -f &quot;${file_prompt}&quot;"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-c &quot;telnet_port 4444&quot; -s &quot;${env_var:CHIBISTUDIO}/tools/openocd/scripts&quot; -f &quot;interface/ti-icdi.cfg&quot; -f &quot;${file_prompt}&quot;"/>
 </launchConfiguration>
diff --git a/tools/eclipse/debug/OpenOCD on STLink (prompts for .cfg target configuration).launch b/tools/eclipse/debug/OpenOCD on STLink (prompts for .cfg target configuration).launch
index 1ab395a1b..133141f6a 100644
--- a/tools/eclipse/debug/OpenOCD on STLink (prompts for .cfg target configuration).launch	
+++ b/tools/eclipse/debug/OpenOCD on STLink (prompts for .cfg target configuration).launch	
@@ -5,5 +5,5 @@
 </listAttribute>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${env_var:OPENOCD}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-c &quot;telnet_port 4444&quot; -s &quot;/ChibiStudio/tools/openocd/scripts&quot; -f &quot;/interface/stlink.cfg&quot; -f &quot;${file_prompt}&quot;"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-c &quot;telnet_port 4444&quot; -s &quot;${env_var:CHIBISTUDIO}/tools/openocd/scripts&quot; -f &quot;/interface/stlink.cfg&quot; -f &quot;${file_prompt}&quot;"/>
 </launchConfiguration>