[Pydev-cvs] org.python.pydev/src/org/python/pydev/runners SimpleRunner.java, 1.18, 1.19
Brought to you by:
fabioz
From: Fabio Z. <fa...@us...> - 2007-09-16 21:16:58
|
Update of /cvsroot/pydev/org.python.pydev/src/org/python/pydev/runners In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23405/src/org/python/pydev/runners Modified Files: SimpleRunner.java Log Message: 120 The path is not 'normalized' in python anymore when getting interpreter info. 119 dlllibs deprecated / Moved isWindowsPlatform() to REF 118 Supporting context insensitive info for zips / Multiple selection for zips and jars. Index: SimpleRunner.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/runners/SimpleRunner.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** SimpleRunner.java 13 Aug 2007 01:16:30 -0000 1.18 --- SimpleRunner.java 16 Sep 2007 21:16:59 -0000 1.19 *************** *** 18,26 **** import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; - import org.eclipse.core.runtime.Platform; import org.eclipse.core.variables.VariablesPlugin; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.ILaunchManager; - import org.eclipse.osgi.service.environment.Constants; import org.python.pydev.core.IPythonPathNature; import org.python.pydev.core.REF; --- 18,24 ---- *************** *** 109,113 **** // Add variables from config ! boolean win32= isWindowsPlatform(); for(Iterator iter= env.entrySet().iterator(); iter.hasNext(); ) { Map.Entry entry= (Map.Entry) iter.next(); --- 107,111 ---- // Add variables from config ! boolean win32= REF.isWindowsPlatform(); for(Iterator iter= env.entrySet().iterator(); iter.hasNext(); ) { Map.Entry entry= (Map.Entry) iter.next(); *************** *** 133,152 **** } ! /** ! * @return whether we are in windows or not ! */ ! public static boolean isWindowsPlatform() { ! try { ! return Platform.getOS().equals(Constants.OS_WIN32); ! } catch (NullPointerException e) { ! String env = System.getProperty("os.name"); ! if(env.toLowerCase().indexOf("win") != -1){ ! return true; ! } ! return false; ! } ! } ! ! /** * copied from org.eclipse.jdt.internal.launching.StandardVMRunner --- 131,135 ---- } ! /** * copied from org.eclipse.jdt.internal.launching.StandardVMRunner |