February 2008 - MacRuby-devel - lists.macosforge.org

[PATCH] Fix for #10, better support for framework load paths
by Benjamin Stiglitz 03 Mar '08

03 Mar '08

From: Benjamin Stiglitz <stig(a)apple.com> --- objc.m | 38 +++++++++++++++++++++----------------- 1 files changed, 21 insertions(+), 17 deletions(-) diff --git a/objc.m b/objc.m index 328bfa2..6af0dcc 100644 --- a/objc.m +++ b/objc.m @@ -1869,8 +1869,7 @@ rb_require_framework(VALUE recv, VALUE framework) } else { /* framework name is given */ - char path[PATH_MAX]; - static char *home = NULL; + const char *path; #define TRY_LOAD_PATH() \ do { \ @@ -1881,23 +1880,28 @@ rb_require_framework(VALUE recv, VALUE framework) } \ while(0) - if (home == NULL) - home = getenv("HOME"); - if (home != NULL) { - snprintf(path, sizeof path, "%s/%s.framework", home, cstr); - TRY_LOAD_PATH(); + NSString *frameworkName = [[[NSFileManager defaultManager] stringWithFileSystemRepresentation:cstr length:strlen(cstr)] stringByAppendingPathExtension:@"framework"]; + + NSFileManager *fileManager = [NSFileManager defaultManager]; + NSArray *libraryDirs = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSAllDomainsMask, YES); + NSUInteger dirIndex, dirCount = [libraryDirs count]; + for (dirIndex = 0; dirIndex < dirCount; ++dirIndex) { + NSString *libraryDir = [libraryDirs objectAtIndex:dirIndex]; + path = [[[libraryDir stringByAppendingPathComponent:@"Frameworks"] stringByAppendingPathComponent:frameworkName] fileSystemRepresentation]; + TRY_LOAD_PATH(); + path = [[[libraryDir stringByAppendingPathComponent:@"PrivateFrameworks"] stringByAppendingPathComponent:frameworkName] fileSystemRepresentation]; + TRY_LOAD_PATH(); } - snprintf(path, sizeof path, - "/System/Library/Frameworks/%s.framework", cstr); - TRY_LOAD_PATH(); - - snprintf(path, sizeof path, "/Library/Frameworks/%s.framework", cstr); - TRY_LOAD_PATH(); - - snprintf(path, sizeof path, - "/System/Library/PrivateFrameworks/%s.framework", cstr); - TRY_LOAD_PATH(); + NSArray *developerDirs = NSSearchPathForDirectoriesInDomains(NSDeveloperDirectory, NSAllDomainsMask, YES); + dirCount = [developerDirs count]; + for (dirIndex = 0; dirIndex < dirCount; ++dirIndex) { + NSString *libraryDir = [[developerDirs objectAtIndex:dirIndex] stringByAppendingPathComponent:@"Library"]; + path = [[[libraryDir stringByAppendingPathComponent:@"Frameworks"] stringByAppendingPathComponent:frameworkName] fileSystemRepresentation]; + TRY_LOAD_PATH(); + path = [[[libraryDir stringByAppendingPathComponent:@"PrivateFrameworks"] stringByAppendingPathComponent:frameworkName] fileSystemRepresentation]; + TRY_LOAD_PATH(); + } #undef TRY_LOAD_PATH -- 1.5.4.2

2 2

seems to work on PowerPC
by Chris Thomas 29 Feb '08

29 Feb '08

http://trac.macosforge.org/projects/ruby/wiki/InstallingMacRuby says: > • Intel machine. PPC machines are not supported, at the moment. It seems to work quite well on my G5. Is there a known problem on PowerPC? Chris

2 1

[PATCH] Adding support for private frameworks
by Benjamin Stiglitz 28 Feb '08

28 Feb '08

Let’s just say I needed it. --- objc.m | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/objc.m b/objc.m index e8c5cd9..7e0886d 100644 --- a/objc.m +++ b/objc.m @@ -1890,6 +1890,10 @@ rb_require_framework(VALUE recv, VALUE framework) snprintf(path, sizeof path, "/Library/Frameworks/%s.framework", cstr); TRY_LOAD_PATH(); + + snprintf(path, sizeof path, + "/System/Library/PrivateFrameworks/%s.framework", cstr); + TRY_LOAD_PATH(); #undef TRY_LOAD_PATH -- 1.5.4.2

2 1

[PATCH] Support for simple exception dump (more soon)
by Benjamin Stiglitz 28 Feb '08

28 Feb '08

--- objc.m | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/objc.m b/objc.m index 7e0886d..97a0b2f 100644 --- a/objc.m +++ b/objc.m @@ -800,11 +800,13 @@ rb_objc_exc_raise(id exception) { const char *name; const char *desc; + const char *stack; name = [[exception name] UTF8String]; desc = [[exception reason] UTF8String]; + stack = [[[exception callStackReturnAddresses] componentsJoinedByString:@",\n"] UTF8String]; - rb_raise(rb_eRuntimeError, "%s: %s", name, desc); + rb_raise(rb_eRuntimeError, "%s: %s at %s", name, desc, stack); } static void -- 1.5.4.2

1 0

[Trunk] CygWin and BCC32 ?
by Stephane Wirtel 28 Feb '08

28 Feb '08

Hi Laurent, Question, Why did you keep the makefiles for bcc32 and cygwin in the trunk ? Do you want to port MacRuby on Windows ? :d Best Regards, Stephane

2 1