[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2096] trunk/org.rubypeople.rdt.launching.tests/ src/org/rubypeople/rdt/internal/launching

[<caw...@us...>]

Revision: 2096
          http://svn.sourceforge.net/rubyeclipse/?rev=2096&view=rev
Author:   cawilliams
Date:     2007-03-06 11:41:19 -0800 (Tue, 06 Mar 2007)

Log Message:
-----------


Modified Paths:
--------------
    trunk/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/TC_RubyRuntime.java
    trunk/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/TC_RunnerLaunching.java

Modified: trunk/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/TC_RubyRuntime.java
===================================================================
--- trunk/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/TC_RubyRuntime.java	2007-03-06 19:21:23 UTC (rev 2095)
+++ trunk/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/TC_RubyRuntime.java	2007-03-06 19:41:19 UTC (rev 2096)
@@ -157,7 +157,7 @@
 		xml.append(name);
 		xml.append("\" path=\"");
 		xml.append(location.toOSString());
-		xml.append("\" vmargs=\"-e STDOUT.sync=true -e STDERR.sync=true -e load(ARGV.shift)\">\r\n");
+		xml.append("\">\r\n");
 		xml.append("<libraryLocations>\r\n");
 		xml.append("<libraryLocation src=\"");
 		xml.append(location.toPortableString());
@@ -166,9 +166,11 @@
 		xml.append(location.toPortableString());
 		xml.append("/lib/ruby/1.8\"/>\r\n");
 		File file = LaunchingPlugin.getFileInPlugin(new Path("ruby" + File.separator + id + File.separator + "lib"));
-		xml.append("<libraryLocation src=\"");
-		xml.append(Path.fromOSString(file.toString()).toPortableString());
-		xml.append("\"/>\r\n");
+		if (file != null) {
+			xml.append("<libraryLocation src=\"");
+			xml.append(Path.fromOSString(file.toString()).toPortableString());
+			xml.append("\"/>\r\n");
+		}
 		xml.append("</libraryLocations>\r\n");
 		xml.append("</vm>\r\n");
 		return xml.toString();

Modified: trunk/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/TC_RunnerLaunching.java
===================================================================
--- trunk/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/TC_RunnerLaunching.java	2007-03-06 19:21:23 UTC (rev 2095)
+++ trunk/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/TC_RunnerLaunching.java	2007-03-06 19:41:19 UTC (rev 2096)
@@ -83,7 +83,6 @@
 		buffer.append(new Path(interpreter.getInstallLocation().getAbsolutePath()).append("bin").append("ruby").toOSString());
 		buffer.append("\" ");
 		buffer.append(INTERPRETER_ARGUMENTS);
-		buffer.append(" -e STDOUT.sync=true -e STDERR.sync=true -e load(ARGV.shift)");
 		buffer.append(" -I \"");
 		buffer.append(project.getLocation().toOSString());
 		buffer.append("\"");


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