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

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

Revision: 2941
          http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=2941&view=rev
Author:   cawilliams
Date:     2007-08-09 05:30:46 -0700 (Thu, 09 Aug 2007)

Log Message:
-----------
fix #5493 - RDT's sync.rb stream flushing script clashes names with a ruby Standard library file

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

Added Paths:
-----------
    trunk/org.rubypeople.rdt.launching/ruby/rdt_stream_sync.rb

Removed Paths:
-------------
    trunk/org.rubypeople.rdt.launching/ruby/sync.rb

Copied: trunk/org.rubypeople.rdt.launching/ruby/rdt_stream_sync.rb (from rev 2801, trunk/org.rubypeople.rdt.launching/ruby/sync.rb)
===================================================================
--- trunk/org.rubypeople.rdt.launching/ruby/rdt_stream_sync.rb	                        (rev 0)
+++ trunk/org.rubypeople.rdt.launching/ruby/rdt_stream_sync.rb	2007-08-09 12:30:46 UTC (rev 2941)
@@ -0,0 +1,2 @@
+STDOUT.sync = true
+STDERR.sync = true
\ No newline at end of file

Deleted: trunk/org.rubypeople.rdt.launching/ruby/sync.rb
===================================================================
--- trunk/org.rubypeople.rdt.launching/ruby/sync.rb	2007-08-09 12:30:38 UTC (rev 2940)
+++ trunk/org.rubypeople.rdt.launching/ruby/sync.rb	2007-08-09 12:30:46 UTC (rev 2941)
@@ -1,2 +0,0 @@
-STDOUT.sync = true
-STDERR.sync = true
\ No newline at end of file

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-08-09 12:30:38 UTC (rev 2940)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/StandardVMRunner.java	2007-08-09 12:30:46 UTC (rev 2941)
@@ -33,8 +33,8 @@
 
 public class StandardVMRunner extends AbstractVMRunner {
 	
+	public static final String STREAM_FLUSH_SCRIPT = "rdt_stream_sync.rb";
 	private static final String LOADPATH_SWITCH = "-I";
-
 	protected static final String END_OF_OPTIONS_DELIMITER = "--";
 	
 	protected IVMInstall fVMInstance;
@@ -268,10 +268,10 @@
 	}
 
 	protected void addStreamSync(List<String> arguments) {
-		File sync = LaunchingPlugin.getFileInPlugin(new Path("ruby/sync.rb"));
+		File sync = LaunchingPlugin.getFileInPlugin(new Path("ruby").append(STREAM_FLUSH_SCRIPT));
 		arguments.add(LOADPATH_SWITCH);
 		arguments.add(sync.getParent());
-		arguments.add("-rsync.rb");
+		arguments.add("-r" + STREAM_FLUSH_SCRIPT);
 	}
 
 }


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