${eclipse_home} macro can be used in binary path

kwin · Jan 4, 2018 · f540a51 · f540a51
1 parent 51c3428
commit f540a51
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/com.googlecode.cppcheclipse.core/src/com/googlecode/cppcheclipse/core/Checker.java b/com.googlecode.cppcheclipse.core/src/com/googlecode/cppcheclipse/core/Checker.java
@@ -74,7 +74,8 @@ public Checker(IConsole console, IPreferenceStore projectPreferences,
 		}
 
 		String binaryPath = CppcheclipsePlugin.getConfigurationPreferenceStore()
-		.getString(IPreferenceConstants.P_BINARY_PATH);
+		.getString(IPreferenceConstants.P_BINARY_PATH)
+		.replace("${eclipse_home}", System.getProperty("eclipse.home.location").replace("file:/", ""));
 
 		command = new CppcheckCommand(console, binaryPath, settingsPreferences,
 				projectPreferences, toolchainSettings.getUserIncludes(), toolchainSettings.getSystemIncludes(), symbols);

diff --git a/...googlecode.cppcheclipse.core/src/com/googlecode/cppcheclipse/core/CppcheclipsePlugin.java b/...googlecode.cppcheclipse.core/src/com/googlecode/cppcheclipse/core/CppcheclipsePlugin.java
@@ -157,7 +157,8 @@ public boolean removeChangeListener(IPropertyChangeListener listener) {
 	private synchronized ProblemProfile getInternalNewProblemProfile(IConsole console, IPreferenceStore store) throws CloneNotSupportedException, XPathExpressionException, IOException, InterruptedException, ParserConfigurationException, SAXException, ProcessExecutionException {
 		if (profile == null) {
 			String binaryPath = CppcheclipsePlugin.getConfigurationPreferenceStore()
-			.getString(IPreferenceConstants.P_BINARY_PATH);
+			.getString(IPreferenceConstants.P_BINARY_PATH)
+			.replace("${eclipse_home}", System.getProperty("eclipse.home.location").replace("file:/", ""));
 			profile = new ProblemProfile(console, binaryPath);
 			registerChangeListener();
 			addChangeListener(profile);

diff --git a/com.googlecode.cppcheclipse.ui/src/com/googlecode/cppcheclipse/ui/UpdateCheck.java b/com.googlecode.cppcheclipse.ui/src/com/googlecode/cppcheclipse/ui/UpdateCheck.java
@@ -94,7 +94,8 @@ public static boolean startUpdateCheck() {
 		// do not start another update check, if one is already running
 		if (UpdateCheck.needUpdateCheck()) {
 			String binaryPath = CppcheclipsePlugin.getConfigurationPreferenceStore()
-			.getString(IPreferenceConstants.P_BINARY_PATH);
+			.getString(IPreferenceConstants.P_BINARY_PATH)
+			.replace("${eclipse_home}", System.getProperty("eclipse.home.location").replace("file:/", ""));
 			new UpdateCheck(true).check(binaryPath);
 			return true;
 		}

diff --git a/...checlipse.ui/src/com/googlecode/cppcheclipse/ui/preferences/BinaryPathPreferencePage.java b/...checlipse.ui/src/com/googlecode/cppcheclipse/ui/preferences/BinaryPathPreferencePage.java
@@ -116,7 +116,9 @@ protected boolean checkState() {
 				if (super.checkState()) {
 					// check if it is valid cppcheck binary
 					try {
-						String path = getTextControl().getText();
+						String path = getTextControl().getText()
+						        .replace("${eclipse_home}", System.getProperty("eclipse.home.location").replace("file:/", ""));
+
 						VersionCommand versionCommand = new VersionCommand(
 								Console.getInstance(), path);
 						Version version = versionCommand