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 13eb2cc..a3be7fa 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 @@ -2,8 +2,15 @@ package net.sourceforge.phpdt.internal.launching; import java.io.File; import java.io.IOException; +import java.util.Iterator; +import java.util.Map; -import org.eclipse.core.boot.BootLoader; +import net.sourceforge.phpdt.internal.core.JavaProject; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.IPath; +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.model.IProcess; @@ -13,19 +20,22 @@ 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; try { - nativePHPProcess = configuration.getInterpreter().exec(commandLine, workingDirectory); + nativePHPProcess = configuration.getInterpreter().exec(commandLine, workingDirectory, env); } catch (IOException e) { throw new RuntimeException("Unable to execute interpreter: " + commandLine + workingDirectory); } IProcess process = DebugPlugin.newProcess(launch, nativePHPProcess, renderLabel(configuration)); process.setAttribute(PHPLaunchingPlugin.PLUGIN_ID + ".launcher.cmdline", commandLine); + return process ; } @@ -54,27 +64,53 @@ public class InterpreterRunner { return buffer.toString(); } + + protected void setEnvironmentVariables(InterpreterRunnerConfiguration configuration) { + IPath FilePath= new Path(configuration.getAbsoluteFileName()); + String OSFilePath= FilePath.toOSString(); + configuration.addEnvironmentValue("REDIRECT_URL",OSFilePath,true); + configuration.addEnvironmentValue("REQUEST_URI",OSFilePath,true); + configuration.addEnvironmentValue("PATH_INFO",OSFilePath,true); + configuration.addEnvironmentValue("PATH_TRANSLATED",OSFilePath,true); + configuration.addEnvironmentValue("SCRIPT_FILENAME",configuration.getInterpreter().getCommand(),true); + configuration.addEnvironmentValue("SERVER_PROTOCOL","HTTP / 1.1",true); + + configuration.addEnvironmentValue("REDIRECT_QUERY_STRING","",true); + configuration.addEnvironmentValue("REDIRECT_STATUS","200",true); + configuration.addEnvironmentValue("SERVER_SOFTWARE","DBG / 2.1",true); + configuration.addEnvironmentValue("SERVER_NAME","localhost",true); + configuration.addEnvironmentValue("SERVER_ADDR","127.0.0.1",true); + configuration.addEnvironmentValue("SERVER_PORT","80",true); + configuration.addEnvironmentValue("REMOTE_ADDR","127.0.0.1",true); + + 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) { + StringBuffer loadPath = new StringBuffer(); + + JavaProject project = configuration.getProject(); + addToLoadPath(loadPath, project.getProject()); -// protected String renderLoadPath(InterpreterRunnerConfiguration configuration) { -// StringBuffer loadPath = new StringBuffer(); -// -// PHPProject project = configuration.getProject(); -// addToLoadPath(loadPath, project.getProject()); -// -// Iterator referencedProjects = project.getReferencedProjects().iterator(); -// while (referencedProjects.hasNext()) -// addToLoadPath(loadPath, (IProject) referencedProjects.next()); -// -// return loadPath.toString(); -// } - -// protected void addToLoadPath(StringBuffer loadPath, IProject project) { -// -// loadPath.append(" -I " + osDependentPath(project.getLocation().toOSString())); -// } + Iterator referencedProjects = project.getReferencedProjects().iterator(); + while (referencedProjects.hasNext()) + addToLoadPath(loadPath, (IProject) referencedProjects.next()); + + return loadPath.toString(); + } + + protected void addToLoadPath(StringBuffer loadPath, IProject project) { + loadPath.append(" -I " + osDependentPath(project.getLocation().toOSString())); + } protected String osDependentPath(String aPath) { - if (BootLoader.getOS().equals(BootLoader.OS_WIN32)) + if (Platform.getOS().equals(Platform.OS_WIN32)) aPath = "\"" + aPath + "\""; return aPath; @@ -82,6 +118,5 @@ public class InterpreterRunner { protected String getDebugCommandLineArgument() { return "" ; - } - + } }