Some cleanup in preparation for next release.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@22618 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2006-03-08 11:28:59 +00:00
parent 172bfc67ef
commit c2e8c881e7
88 changed files with 570 additions and 425 deletions

View file

@ -371,12 +371,22 @@ _find_framework(NSString *name)
}
@interface NSBundle (Private)
+ (NSString *) _absolutePathOfExecutable: (NSString *)path;
+ (void) _addFrameworkFromClass: (Class)frameworkClass;
- (NSArray *) _bundleClasses;
+ (NSString*) _gnustep_target_cpu;
+ (NSString*) _gnustep_target_dir;
+ (NSString*) _gnustep_target_os;
+ (NSString*) _library_combo;
@end
@implementation NSBundle (Private)
+ (NSString *) _absolutePathOfExecutable: (NSString *)path
{
return AbsolutePathOfExecutable(path, NO);
}
/* Nicola & Mirko:
Frameworks can be used in an application in two different ways:
@ -615,6 +625,26 @@ _find_framework(NSString *name)
return _bundleClasses;
}
+ (NSString*) _gnustep_target_cpu
{
return gnustep_target_cpu;
}
+ (NSString*) _gnustep_target_dir
{
return gnustep_target_dir;
}
+ (NSString*) _gnustep_target_os
{
return gnustep_target_os;
}
+ (NSString*) _library_combo
{
return library_combo;
}
@end
/*
@ -1883,19 +1913,6 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
return nil;
}
+ (NSString *) _absolutePathOfExecutable: (NSString *)path
{
return AbsolutePathOfExecutable(path, NO);
}
+ (NSBundle *) gnustepBundle
{
/* Deprecated since 1.7.0 */
GSOnceMLog(@"Warning: Deprecated method %@ called. Use +bundleForLibrary: instead",
NSStringFromSelector(_cmd));
return _gnustep_bundle;
}
+ (NSString *) pathForLibraryResource: (NSString *)name
ofType: (NSString *)ext
inDirectory: (NSString *)bundlePath
@ -1922,36 +1939,5 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
return path;
}
+ (NSString *) pathForGNUstepResource: (NSString *)name
ofType: (NSString *)ext
inDirectory: (NSString *)bundlePath
{
/* Deprecated since 1.7.0 */
GSOnceMLog(@"Warning: Deprecated method %@ called. Use +pathForLibraryResource:ofType:inDirectory: or +bundleForLibrary: instead",
NSStringFromSelector(_cmd));
return [self pathForLibraryResource: name ofType: ext
inDirectory: bundlePath];
}
+ (NSString*) _gnustep_target_cpu
{
return gnustep_target_cpu;
}
+ (NSString*) _gnustep_target_dir
{
return gnustep_target_dir;
}
+ (NSString*) _gnustep_target_os
{
return gnustep_target_os;
}
+ (NSString*) _library_combo
{
return library_combo;
}
@end