Update how West is invoked

Zephyr has changed how West is being invoked, and now West can be invoked by running Python directly instead of the west executable. This needs some tweaking on how West is invoked in the plugin. Signed-off-by: Daniel Leung <[email protected]>
zephyrproject-rtos · Sep 16, 2020 · 53b177d · 53b177d
1 parent 019e726
commit 53b177d
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 6 deletions.
diff --git a/...11/src/org/zephyrproject/ide/eclipse/core/internal/launch/java11/ZephyrLaunchHelpers.java b/...11/src/org/zephyrproject/ide/eclipse/core/internal/launch/java11/ZephyrLaunchHelpers.java
@@ -106,7 +106,16 @@ public Process runWest(IProject project,
 		}
 
 		ArrayList<String> cmds = new ArrayList<String>();
-		cmds.add(westPath);
+
+		if (westPath.indexOf(';') == -1) {
+			cmds.add(westPath);
+		} else {
+			String[] westPathBits = westPath.split(";");
+			for (String s : westPathBits) {
+				cmds.add(s);
+			}
+		}
+
 		cmds.add(action);
 		if (args != null) {
 			cmds.addAll(ZephyrHelpers.parseWestArguments(args));

diff --git a/...nux/src/org/zephyrproject/ide/eclipse/core/internal/launch/linux/ZephyrLaunchHelpers.java b/...nux/src/org/zephyrproject/ide/eclipse/core/internal/launch/linux/ZephyrLaunchHelpers.java
@@ -98,7 +98,16 @@ public Process runWest(IProject project,
 		}
 
 		ArrayList<String> cmds = new ArrayList<String>();
-		cmds.add(westPath);
+
+		if (westPath.indexOf(';') == -1) {
+			cmds.add(westPath);
+		} else {
+			String[] westPathBits = westPath.split(";");
+			for (String s : westPathBits) {
+				cmds.add(s);
+			}
+		}
+
 		cmds.add(action);
 		if (args != null) {
 			cmds.add(args);

diff --git a/...sx/src/org/zephyrproject/ide/eclipse/core/internal/launch/macosx/ZephyrLaunchHelpers.java b/...sx/src/org/zephyrproject/ide/eclipse/core/internal/launch/macosx/ZephyrLaunchHelpers.java
@@ -98,7 +98,16 @@ public Process runWest(IProject project,
 		}
 
 		ArrayList<String> cmds = new ArrayList<String>();
-		cmds.add(westPath);
+
+		if (westPath.indexOf(';') == -1) {
+			cmds.add(westPath);
+		} else {
+			String[] westPathBits = westPath.split(";");
+			for (String s : westPathBits) {
+				cmds.add(s);
+			}
+		}
+
 		cmds.add(action);
 		if (args != null) {
 			cmds.add(args);

diff --git a/...ct.ide.eclipse.core/src/org/zephyrproject/ide/eclipse/core/internal/build/CMakeCache.java b/...ct.ide.eclipse.core/src/org/zephyrproject/ide/eclipse/core/internal/build/CMakeCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Intel Corporation
+ * Copyright (c) 2019-2020 Intel Corporation
  *
  * SPDX-License-Identifier: EPL-2.0
  */
@@ -83,7 +83,22 @@ public String getString(String name) {
 	 *         not of type FILEPATH
 	 */
 	public String getFilePath(String name) {
-		return getTypedValue("FILEPATH=", name); //$NON-NLS-1$
+		String val = getTypedValue("FILEPATH=", name); //$NON-NLS-1$
+
+		if ((val != null) && (val.indexOf("-NOTFOUND") != -1)) {
+			return null;
+		}
+
+		return val;
+	}
+
+	/**
+	 * @param name Name of cached variable with type INTERNAL
+	 * @return The INTERNAL value or {@code null} if variable does not exist or
+	 *         not of type INTERNAL
+	 */
+	public String getInternal(String name) {
+		return getTypedValue("INTERNAL=", name); //$NON-NLS-1$
 	}
 
 	/**
@@ -118,7 +133,15 @@ public String getGdb() {
 	 * @return Path to West as discovered by CMake
 	 */
 	public String getWest() {
-		return getFilePath(WEST);
+		/* WEST can appear as FILEPATH or INTERNAL. */
+
+		String val = getFilePath(WEST);
+
+		if (val == null) {
+			val = getInternal(WEST);
+		}
+
+		return val;
 	}
 
 	/**