[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2253] trunk/org.rubypeople.rdt.launching

[<mba...@us...>]

Revision: 2253
          http://svn.sourceforge.net/rubyeclipse/?rev=2253&view=rev
Author:   mbarchfe
Date:     2007-03-31 11:01:52 -0700 (Sat, 31 Mar 2007)

Log Message:
-----------
switched to rdebug-ide; pull thread state

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RDebugVMDebugger.java
    trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/StandardVMDebugger.java

Added Paths:
-----------
    trunk/org.rubypeople.rdt.launching/ruby-debug-base-0.9.gem
    trunk/org.rubypeople.rdt.launching/ruby-debug-ide-0.1.0.gem

Removed Paths:
-------------
    trunk/org.rubypeople.rdt.launching/ruby-debug-0.8.gem

Deleted: trunk/org.rubypeople.rdt.launching/ruby-debug-0.8.gem
===================================================================
(Binary files differ)

Added: trunk/org.rubypeople.rdt.launching/ruby-debug-base-0.9.gem
===================================================================
(Binary files differ)


Property changes on: trunk/org.rubypeople.rdt.launching/ruby-debug-base-0.9.gem
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/org.rubypeople.rdt.launching/ruby-debug-ide-0.1.0.gem
===================================================================
(Binary files differ)


Property changes on: trunk/org.rubypeople.rdt.launching/ruby-debug-ide-0.1.0.gem
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RDebugVMDebugger.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RDebugVMDebugger.java	2007-03-31 18:01:16 UTC (rev 2252)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RDebugVMDebugger.java	2007-03-31 18:01:52 UTC (rev 2253)
@@ -42,31 +42,25 @@
 
 	protected List<String> debugSpecificVMArgs(RubyDebugTarget debugTarget) {
 		List<String> arguments = new ArrayList<String>();
-		arguments.add("--server");
-		arguments.add("-w"); // wait for client to connect on command port
-		arguments.add("-n"); // do not halt when client connects
 		arguments.add("--port");
 		arguments.add(Integer.toString(debugTarget.getPort()));
-		arguments.add("--cport");
-		arguments.add(Integer.toString(debugTarget.getPort() + 1));
 		if (isDebuggerVerbose()) {
 			arguments.add("-d");
 		}
-		arguments.add("-f");
-		arguments.add("xml");
 		return arguments;
 	}
 	
 	protected RubyDebuggerProxy getDebugProxy(RubyDebugTarget debugTarget) {
-		return new RubyDebuggerProxy(debugTarget, RDebugVMDebugger.getDirectoryOfRubyDebuggerFile(), true);
+		return new RubyDebuggerProxy(debugTarget, true);
 	}
 
 	public static String findRDebugExecutable(File vmInstallLocation) {
 		// see StandardVMRunner.constructProgramString
-		String cmd = "rdebug" ;
-		String path = vmInstallLocation + File.separator + "bin" + File.separator + "rdebug.cmd" ;
+		String cmd = "rdebug-ide" ;
+		String cmdWin = "rdebug-ide.cmd";
+		String path = vmInstallLocation + File.separator + "bin" + File.separator + cmdWin;
 		if (new File(path).exists()) {
-			cmd = "rdebug.cmd" ;
+			cmd = cmdWin ;
 		}
 		return cmd ;
 	}

Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/StandardVMDebugger.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/StandardVMDebugger.java	2007-03-31 18:01:16 UTC (rev 2252)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/StandardVMDebugger.java	2007-03-31 18:01:52 UTC (rev 2253)
@@ -118,7 +118,9 @@
 		}
 
 		IProcess process = newProcess(launch, p, renderProcessLabel(cmdLine), getDefaultProcessMap());
-		process.setAttribute(IProcess.ATTR_CMDLINE, renderCommandLine(cmdLine));
+		String commandLine = renderCommandLine(cmdLine);
+		LaunchingPlugin.debug("Starting: " + commandLine) ;
+		process.setAttribute(IProcess.ATTR_CMDLINE, commandLine);
 		subMonitor.worked(1);
 		subMonitor.subTask(LaunchingMessages.StandardVMDebugger_Establishing_debug_connection____5);
 
@@ -140,7 +142,7 @@
 	}
 
 	protected RubyDebuggerProxy getDebugProxy(RubyDebugTarget debugTarget) {
-		return new RubyDebuggerProxy(debugTarget, getDirectoryOfRubyDebuggerFile(), false);
+		return new RubyDebuggerProxy(debugTarget, false /* isRubyDebug*/);
 	}
 
 	protected List<String> debugSpecificVMArgs(RubyDebugTarget debugTarget) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.