gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-06-01 17:12:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed [NSBundle bundleForLibrary: @"gnustep-base"];

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24883 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
nicola 2007-03-17 00:27:42 +00:00
parent 77603ffa66
commit 21301be277
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2007-03-17 Nicola Pero <nicola.pero@meta-innovation.com>
* Source/NSBundle.m ([+bundleForLibrary:version:]): Fixed looking
up library resource bundle when no version is provided.
2007-03-16 Richard Frith-Macdonald <rfm@gnu.org> 2007-03-16 Richard Frith-Macdonald <rfm@gnu.org>
* Source/unix/NSStream.m: * Source/unix/NSStream.m:

7
Source/NSBundle.m
View file

@ -2273,14 +2273,19 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
/* Any version will do. */ /* Any version will do. */
NSString *versionsPath = [[path stringByAppendingPathComponent: libraryName] NSString *versionsPath = [[path stringByAppendingPathComponent: libraryName]
stringByAppendingPathComponent: @"Versions"]; stringByAppendingPathComponent: @"Versions"];
if ([fm fileExistsAtPath: versionsPath isDirectory: &isDir] && isDir) if ([fm fileExistsAtPath: versionsPath isDirectory: &isDir] && isDir)
{ {
/* TODO: Ignore subdirectories. */
NSEnumerator *fileEnumerator = [fm enumeratorAtPath: versionsPath]; NSEnumerator *fileEnumerator = [fm enumeratorAtPath: versionsPath];
NSString *potentialPath; NSString *potentialPath;
while ((potentialPath = [fileEnumerator nextObject]) != nil) while ((potentialPath = [fileEnumerator nextObject]) != nil)
{ {
potentialPath = [potentialPath stringByAppendingPathComponent: @"Resources"]; potentialPath = [versionsPath
stringByAppendingPathComponent:
[potentialPath
stringByAppendingPathComponent: @"Resources"]];
if ([fm fileExistsAtPath: potentialPath isDirectory: &isDir] && isDir) if ([fm fileExistsAtPath: potentialPath isDirectory: &isDir] && isDir)
{ {
b = [self bundleWithPath: potentialPath]; b = [self bundleWithPath: potentialPath];