print GOROOT/GOPATH for any tool invoked

GoClipse · Jul 3, 2017 · b02983b · b02983b
1 parent ee75b7d
commit b02983b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/plugin_ide.core/src/com/googlecode/goclipse/core/operations/GoBuildManager.java b/plugin_ide.core/src/com/googlecode/goclipse/core/operations/GoBuildManager.java
@@ -411,10 +411,12 @@ protected BuildOperationCreator createBuildOperationCreator(
 			protected void addCompositeBuildOperationMessage() throws CommonException {
 				super.addCompositeBuildOperationMessage();
 
-				GoEnvironment goEnv = GoProjectEnvironment.getGoEnvironment(project);
-
-				addOperation(newMessageOperation("  with GOROOT: " + goEnv.getGoRoot().asString() + "\n"));
-				addOperation(newMessageOperation("  with GOPATH: " + goEnv.getGoPathString() + "\n"));
+				// experimental: this code was removed, and instead this info is printed by the tool ruun
+				// which will print it for any Go tool invoked, not just for build
+//				GoEnvironment goEnv = GoProjectEnvironment.getGoEnvironment(project);
+//				
+//				addOperation(newMessageOperation("  with GOROOT: " + goEnv.getGoRoot().asString() + "\n"));
+//				addOperation(newMessageOperation("  with GOPATH: " + goEnv.getGoPathString() + "\n"));
 			}
 		};
 	}

diff --git a/plugin_ide.ui/src/com/googlecode/goclipse/ui/GoOperationsConsoleUIHandler.java b/plugin_ide.ui/src/com/googlecode/goclipse/ui/GoOperationsConsoleUIHandler.java
@@ -10,10 +10,13 @@
  *******************************************************************************/
 package com.googlecode.goclipse.ui;
 
+import com.googlecode.goclipse.tooling.env.GoEnvironmentConstants;
+
 import melnorme.lang.ide.ui.LangImages;
 import melnorme.lang.ide.ui.tools.console.LangOperationsConsoleUIHandler;
 import melnorme.lang.ide.ui.tools.console.ToolsConsole;
 import melnorme.lang.ide.ui.tools.console.ToolsConsole.IOConsoleOutputStreamExt;
+import melnorme.lang.utils.EnvUtils;
 
 public class GoOperationsConsoleUIHandler extends LangOperationsConsoleUIHandler {
 
@@ -38,6 +41,20 @@ protected OperationConsoleMonitor createConsoleHandler(ProcessStartKind kind, To
 		return monitor;
 	}
 
+	@Override
+	protected String getPrefaceText(String prefixText, String suffixText, ProcessBuilder pb) {
+		String prefaceText = super.getPrefaceText(prefixText, suffixText, pb);
+		String goRoot= EnvUtils.getVarFromEnvMap(pb.environment(), GoEnvironmentConstants.GOROOT);
+		if (goRoot != null) {
+			prefaceText += "   with GOROOT: " + goRoot + "\n";
+		}
+		String goPath = EnvUtils.getVarFromEnvMap(pb.environment(), GoEnvironmentConstants.GOPATH);
+		if (goPath != null) {
+			prefaceText += "   with GOPATH: " + goPath + "\n";
+		}
+		return prefaceText;
+	}
+
 	@Override
 	protected String getProcessTerminatedMessage(int exitCode) {
 		return " " + super.getProcessTerminatedMessage(exitCode);