|
From: Markus B. <mba...@us...> - 2005-10-13 19:00:04
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30498/src/org/rubypeople/rdt/internal/launching Modified Files: TC_RunnerLaunching.java Log Message: removed quotation of paths (include and ruby file) on windows. seems to be unnecessary due to new exec() call Index: TC_RunnerLaunching.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/TC_RunnerLaunching.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TC_RunnerLaunching.java 11 Oct 2005 21:13:08 -0000 1.3 --- TC_RunnerLaunching.java 13 Oct 2005 18:59:46 -0000 1.4 *************** *** 15,19 **** import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; - import org.eclipse.core.runtime.Platform; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.ILaunch; --- 15,18 ---- *************** *** 47,52 **** commandLine.add("-reclipseDebug"); } ! // The include paths and the executed ruby file is quoted on windows ! String pathQuotation = Platform.getOS().equals(Platform.OS_WIN32) ? "\"" : "" ; if (debug) { String dirOfRubyDebuggerFile = DebuggerRunner.getDirectoryOfRubyDebuggerFile().replace('/', File.separatorChar) ; --- 46,50 ---- commandLine.add("-reclipseDebug"); } ! // The include paths and the executed ruby file is quoted on windows if (debug) { String dirOfRubyDebuggerFile = DebuggerRunner.getDirectoryOfRubyDebuggerFile().replace('/', File.separatorChar) ; *************** *** 55,68 **** } commandLine.add("-I"); ! commandLine.add(pathQuotation + dirOfRubyDebuggerFile + pathQuotation); } commandLine.add("-I"); ! commandLine.add( pathQuotation + project.getLocation().toOSString() + pathQuotation); commandLine.add("-I"); ! commandLine.add(pathQuotation + project.getLocation().toOSString() + File.separator + RUBY_LIB_DIR + pathQuotation) ; commandLine.addAll(Arrays.asList(INTERPRETER_ARGUMENTS.split("\\s+"))); commandLine.add("--"); // use always forward slashes for path relative to project dir ! commandLine.add(pathQuotation + project.getLocation().toOSString() + "/" + RUBY_LIB_DIR + "/" + RUBY_FILE_NAME + pathQuotation); commandLine.add(PROGRAM_ARGUMENTS); return commandLine; --- 53,66 ---- } commandLine.add("-I"); ! commandLine.add(dirOfRubyDebuggerFile); } commandLine.add("-I"); ! commandLine.add(project.getLocation().toOSString()); commandLine.add("-I"); ! commandLine.add(project.getLocation().toOSString() + File.separator + RUBY_LIB_DIR ) ; commandLine.addAll(Arrays.asList(INTERPRETER_ARGUMENTS.split("\\s+"))); commandLine.add("--"); // use always forward slashes for path relative to project dir ! commandLine.add(project.getLocation().toOSString() + "/" + RUBY_LIB_DIR + "/" + RUBY_FILE_NAME ); commandLine.add(PROGRAM_ARGUMENTS); return commandLine; |