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

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

Revision: 3191
          http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3191&view=rev
Author:   cawilliams
Date:     2007-09-14 14:44:59 -0700 (Fri, 14 Sep 2007)

Log Message:
-----------
try to pick proper JRuby executable on each platform

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/JRubyVMType.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/JRubyVMType.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/JRubyVMType.java	2007-09-14 21:42:41 UTC (rev 3190)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/JRubyVMType.java	2007-09-14 21:44:59 UTC (rev 3191)
@@ -164,7 +164,7 @@
 		for (int i = 0; i < fgCandidateRubyFiles.length; i++) {
 			for (int j = 0; j < fgCandidateRubyLocations.length; j++) {
 				File rubyFile = new File(vmInstallLocation, fgCandidateRubyLocations[j] + fgCandidateRubyFiles[i]);
-				if (rubyFile.isFile() && isPlatformProper(rubyFile)) { // FIXME Only check for .bat on win32 and others on other platforms
+				if (rubyFile.isFile() && isPlatformProper(rubyFile)) { // Only check for .bat on win32 and others on other platforms
 					return rubyFile;
 				}				
 			}

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-09-14 21:42:41 UTC (rev 3190)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/StandardVMRunner.java	2007-09-14 21:44:59 UTC (rev 3191)
@@ -173,12 +173,13 @@
 				string.add(exe.getAbsolutePath());
 				return string;
 			}
+		} else {
+			exe = new File(path);
+			if (fileExists(exe)){
+				string.add(exe.getAbsolutePath());
+				return string;
+			}
 		}
-		exe = new File(path);
-		if (fileExists(exe)){
-			string.add(exe.getAbsolutePath());
-			return string;
-		}
 		
 		// not found
 		abort(MessageFormat.format(LaunchingMessages.StandardVMRunner_Specified_executable__0__does_not_exist_for__1__4, command, fVMInstance.getName()), null, IRubyLaunchConfigurationConstants.ERR_INTERNAL_ERROR); 


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