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

Small tidyup in NSBundle +initialize

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24913 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
nicola 2007-03-21 13:11:45 +00:00
parent 56b7d94f6a
commit 8a44053afb
2 changed files with 70 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2007-03-21 Nicola Pero <nicola.pero@meta-innovation.com>
* Source/NSBundle.m ([+initialize]): Removed unused check.
2007-03-20 Nicola Pero <nicola.pero@meta-innovation.com> 2007-03-20 Nicola Pero <nicola.pero@meta-innovation.com>
* Source/NSUserDefaults.m ([+standardUserDefaults]): Fixed bug * Source/NSUserDefaults.m ([+standardUserDefaults]): Fixed bug

17
Source/NSBundle.m
View file

@ -774,17 +774,23 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
if (self == [NSBundle class]) if (self == [NSBundle class])
{ {
NSDictionary *env; NSDictionary *env;
NSString *str;
_emptyTable = RETAIN([NSDictionary dictionary]); _emptyTable = RETAIN([NSDictionary dictionary]);
/* Need to make this recursive since both mainBundle and initWithPath: /* Need to make this recursive since both mainBundle and
want to lock the thread */ * initWithPath: want to lock the thread.
*/
load_lock = [NSRecursiveLock new]; load_lock = [NSRecursiveLock new];
env = [[NSProcessInfo processInfo] environment]; env = [[NSProcessInfo processInfo] environment];
if (env)
{
NSString *str;
/* These variables are used when we are running non-flattened.
* This means that there are multiple binaries for different
* OSes, and we need constantly to choose the right one (eg,
* when loading a bundle or a framework). The choice is based
* on these environments variables that are set by GNUstep.sh
* (you must source GNUstep.sh when non-flattened).
*/
if ((str = [env objectForKey: @"GNUSTEP_TARGET_CPU"]) != nil) if ((str = [env objectForKey: @"GNUSTEP_TARGET_CPU"]) != nil)
gnustep_target_cpu = RETAIN(str); gnustep_target_cpu = RETAIN(str);
else if ((str = [env objectForKey: @"GNUSTEP_HOST_CPU"]) != nil) else if ((str = [env objectForKey: @"GNUSTEP_HOST_CPU"]) != nil)
@ -855,7 +861,6 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
#endif #endif
} }
} }
}
/** /**
* Returns an array of all the bundles which do not belong to frameworks.<br /> * Returns an array of all the bundles which do not belong to frameworks.<br />