3.x compatibility

[phpeclipse.git] / net.sourceforge.phpeclipse.launching / src / net / sourceforge / phpdt / internal / launching / InterpreterRunner.java

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..b32752f 100644 (file)
--- 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,30 +2,35 @@ package net.sourceforge.phpdt.internal.launching;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Iterator;
 
 import org.eclipse.core.boot.BootLoader;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.model.IProcess;
 
+import net.sourceforge.phpeclipse.resourcesview.PHPProject;
+
 public class InterpreterRunner {
 
        public InterpreterRunner() {
        }
 
-       public IProcess run(InterpreterRunnerConfiguration configuration, ILaunch launch) {
-               String commandLine = renderCommandLine(configuration);
+       public IProcess run(InterpreterRunnerConfiguration configuration, ILaunch launch, String[] env) {               
+               String commandLine = renderCommandLine(configuration);          
                File workingDirectory = configuration.getAbsoluteWorkingDirectory();
 
                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 ;
        }
 
@@ -55,23 +60,22 @@ public class InterpreterRunner {
                return buffer.toString();
        }
 
-//     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()));
-//     }
+       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()));
+       }
 
        protected String osDependentPath(String aPath) {
                if (BootLoader.getOS().equals(BootLoader.OS_WIN32))
@@ -82,6 +86,5 @@ public class InterpreterRunner {
        
        protected String getDebugCommandLineArgument() {
                return "" ;     
-       }
-       
+       }       
 }