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

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

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

Log Message:
-----------
move sync stuff over to launcher, not VM

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/StandardVM.java
    trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/StandardVMRunner.java

Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/StandardVM.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/StandardVM.java	2007-03-06 13:48:05 UTC (rev 2094)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/StandardVM.java	2007-03-06 19:21:23 UTC (rev 2095)
@@ -167,14 +167,4 @@
 		}
 		return null;
 	}
-	
-	
-	@Override
-	public String getVMArgs() {
-		String vmArgs = super.getVMArgs();
-		if (vmArgs == null) vmArgs = "";
-		else vmArgs += " ";
-		vmArgs += "-e STDOUT.sync=true -e STDERR.sync=true -e load(ARGV.shift)";
-		return vmArgs;
-	}
 }

Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/StandardVMRunner.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/StandardVMRunner.java	2007-03-06 13:48:05 UTC (rev 2094)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/StandardVMRunner.java	2007-03-06 19:21:23 UTC (rev 2095)
@@ -195,6 +195,13 @@
 		// options like '-client' & '-server' which are required to be the first option
 		String[] allVMArgs = combineVmArgs(config, fVMInstance);
 		addArguments(allVMArgs, arguments);
+		// FIXME Find a better place for this to go?
+		arguments.add("-e");
+		arguments.add("STDOUT.sync=true");
+		arguments.add("-e");
+		arguments.add("STDERR.sync=true");
+		arguments.add("-e");
+		arguments.add("load(ARGV.shift)");
 		
 		String[] lp= config.getLoadPath();
 		if (lp.length > 0) {


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