[macruby-changes] [3290] MacRuby/trunk

source_changes at macosforge.org source_changes at macosforge.org
Sun Jan 17 22:04:29 PST 2010


Revision: 3290
          http://trac.macosforge.org/projects/ruby/changeset/3290
Author:   lsansonetti at apple.com
Date:     2010-01-17 22:04:25 -0800 (Sun, 17 Jan 2010)
Log Message:
-----------
fixed internal debugger interpreter path

Modified Paths:
--------------
    MacRuby/trunk/MacRubyDebuggerConnector.h
    MacRuby/trunk/MacRubyDebuggerConnector.m
    MacRuby/trunk/bin/rubyd

Modified: MacRuby/trunk/MacRubyDebuggerConnector.h
===================================================================
--- MacRuby/trunk/MacRubyDebuggerConnector.h	2010-01-18 05:20:49 UTC (rev 3289)
+++ MacRuby/trunk/MacRubyDebuggerConnector.h	2010-01-18 06:04:25 UTC (rev 3290)
@@ -17,14 +17,15 @@
 
 @interface MacRubyDebuggerConnector : NSObject
 {
+    NSString *_interpreterPath;
+    NSMutableArray *_arguments;
     NSString *_socketPath;
-    NSMutableArray *_arguments;
     NSTask *_task;
     NSFileHandle *_socket;
     NSString *_location;
 }
 
-- (id)initWithArguments:(NSArray *)arguments;
+- (id)initWithInterpreterPath:(NSString *)path arguments:(NSArray *)arguments;
 
 // Execution control.
 

Modified: MacRuby/trunk/MacRubyDebuggerConnector.m
===================================================================
--- MacRuby/trunk/MacRubyDebuggerConnector.m	2010-01-18 05:20:49 UTC (rev 3289)
+++ MacRuby/trunk/MacRubyDebuggerConnector.m	2010-01-18 06:04:25 UTC (rev 3290)
@@ -50,7 +50,7 @@
     }
 }
 
-- (id)initWithArguments:(NSArray *)arguments
+- (id)initWithInterpreterPath:(NSString *)ipath arguments:(NSArray *)arguments
 {
     self = [super init];
     if (self != nil) {
@@ -70,6 +70,7 @@
 	[_arguments addObject:_socketPath];
 	[_arguments addObjectsFromArray:arguments];
 
+	_interpreterPath = ipath;
 	_task = nil;
 	_socket = nil;
 	_location = nil;
@@ -88,7 +89,7 @@
     if (_task == nil || ![_task isRunning]) {
 	// Create task.
 	_task = [NSTask new];
-	[_task setLaunchPath:@"./miniruby"]; // XXX
+	[_task setLaunchPath:_interpreterPath];
 	[_task setArguments:_arguments];
 
 	// Launch the remote process.

Modified: MacRuby/trunk/bin/rubyd
===================================================================
--- MacRuby/trunk/bin/rubyd	2010-01-18 05:20:49 UTC (rev 3289)
+++ MacRuby/trunk/bin/rubyd	2010-01-18 06:04:25 UTC (rev 3290)
@@ -6,12 +6,16 @@
 # Copyright (C) 2010, Apple Inc
 
 require 'readline'
+require 'rbconfig'
 
 class Debugger
   def initialize(args)
     @terran_mode = args.delete('--terran')
+    internal = args.delete('--internal')
     raise "need at least one argument" if args.empty?
-    @connector = ::MacRubyDebuggerConnector.alloc.initWithArguments(args)
+    path = internal ? './miniruby' : File.join(RbConfig::CONFIG['bindir'],
+      RbConfig::CONFIG['RUBY_INSTALL_NAME'])
+    @connector = ::MacRubyDebuggerConnector.alloc.initWithInterpreterPath(path,       arguments: args)
   end
 
   def run
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20100117/65d52e9e/attachment-0001.html>


More information about the macruby-changes mailing list