[Pydev-cvs] org.python.pydev.debug/src/org/python/pydev/debug/ui/launching PythonRunnerConfig.java,1.32,1.33

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev.debug/src/org/python/pydev/debug/ui/launching
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28290/src/org/python/pydev/debug/ui/launching

Modified Files:
	PythonRunnerConfig.java 
Log Message:


Index: PythonRunnerConfig.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/src/org/python/pydev/debug/ui/launching/PythonRunnerConfig.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** PythonRunnerConfig.java	14 Aug 2005 21:28:14 -0000	1.32
--- PythonRunnerConfig.java	17 Aug 2005 01:54:48 -0000	1.33
***************
*** 56,59 ****
--- 56,60 ----
  	public String[] arguments;
  	public File workingDirectory;
+ 	public String pythonpathUsed;
  	// debugging
  	public boolean isDebug;
***************
*** 228,231 ****
--- 229,233 ----
              //put the pythonpath in it
              envp = new SimplePythonRunner().getEnvironment(project);
+             pythonpathUsed = SimpleRunner.makePythonPathEnvString(project);
          }else{
      		boolean win32= Platform.getOS().equals(org.eclipse.osgi.service.environment.Constants.OS_WIN32);
***************
*** 238,244 ****
--- 240,248 ----
  	    		
  	            String pythonpath = SimpleRunner.makePythonPathEnvString(project);
+                 pythonpathUsed = pythonpath; 
  	            //override it if it was the ambient pythonpath
  	            for (int i = 0; i < envp.length; i++) {
  	                if(win32){
+                         //case insensitive
  		                if(envp[i].toUpperCase().startsWith("PYTHONPATH")){
  		                    //OK, finish it.
***************
*** 383,391 ****
              interpreter = SimpleRunner.formatParamToExec(interpreter);
              cmdArgs.add(javaLoc);
              cmdArgs.add("-classpath");
!             cmdArgs.add(interpreter);
              cmdArgs.add("-Dpython.path=%PYTHONPATH%"); //will be added to the env variables in the run (check if this works on all platforms...)
              cmdArgs.add("org.python.util.jython");
! 
          }else{
          
--- 387,401 ----
              interpreter = SimpleRunner.formatParamToExec(interpreter);
              cmdArgs.add(javaLoc);
+ 
+             //some nice things on the classpath config: http://mindprod.com/jgloss/classpath.html
              cmdArgs.add("-classpath");
!             cmdArgs.add(interpreter+SimpleRunner.getPythonPathSeparator()+"%PYTHONPATH%");
              cmdArgs.add("-Dpython.path=%PYTHONPATH%"); //will be added to the env variables in the run (check if this works on all platforms...)
              cmdArgs.add("org.python.util.jython");
!             
!             if (isDebug) {
!                 throw new RuntimeException("still not implemented");
!             }
!             
          }else{