X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/InterpreterRunner.java b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/InterpreterRunner.java index ee56530..cf8141a 100644 --- a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/InterpreterRunner.java +++ b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/InterpreterRunner.java @@ -13,8 +13,6 @@ import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.ILaunch; -import org.eclipse.debug.core.ILaunchManager; -import org.eclipse.debug.core.Launch; import org.eclipse.debug.core.model.IProcess; public class InterpreterRunner { @@ -22,10 +20,10 @@ public class InterpreterRunner { public InterpreterRunner() { } - public IProcess run(InterpreterRunnerConfiguration configuration, ILaunch launch) { - String commandLine = renderCommandLine(configuration); + public IProcess run(InterpreterRunnerConfiguration configuration, ILaunch launch) { + String commandLine = renderCommandLine(configuration); File workingDirectory = configuration.getAbsoluteWorkingDirectory(); - + setEnvironmentVariables(configuration); String[] env = configuration.getEnvironment(); Process nativePHPProcess = null; @@ -38,7 +36,7 @@ public class InterpreterRunner { IProcess process = DebugPlugin.newProcess(launch, nativePHPProcess, renderLabel(configuration)); process.setAttribute(PHPLaunchingPlugin.PLUGIN_ID + ".launcher.cmdline", commandLine); process.setAttribute(IProcess.ATTR_PROCESS_TYPE, PHPLaunchConfigurationAttribute.PHP_LAUNCH_PROCESS_TYPE); - + return process ; } @@ -67,7 +65,7 @@ public class InterpreterRunner { return buffer.toString(); } - + protected void setEnvironmentVariables(InterpreterRunnerConfiguration configuration) { IPath FilePath= new Path(configuration.getAbsoluteFileName()); String OSFilePath= FilePath.toOSString(); @@ -88,11 +86,11 @@ public class InterpreterRunner { configuration.addEnvironmentValue("GATEWAY_INTERFACE","CGI / 1.1",true); configuration.addEnvironmentValue("REQUEST_METHOD","GET",true); - + Map stringVars = DebugPlugin.getDefault().getLaunchManager().getNativeEnvironment(); if (stringVars.containsKey("SYSTEMROOT")) configuration.addEnvironmentValue("SYSTEMROOT",(String) stringVars.get("SYSTEMROOT"),true); - + } protected String renderLoadPath(InterpreterRunnerConfiguration configuration) { @@ -118,8 +116,8 @@ public class InterpreterRunner { return aPath; } - + protected String getDebugCommandLineArgument() { - return "" ; - } + return "" ; + } }