From 761f39286ffc6da6089fe4ef637c6c0e3e45cc11 Mon Sep 17 00:00:00 2001 From: helge Date: Tue, 4 Jul 2006 15:53:30 +0000 Subject: [PATCH] added debug logs to bundle manager git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1306 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-core/NGExtensions/ChangeLog | 3 +++ sope-core/NGExtensions/NGBundleManager.m | 15 ++++++++++++--- sope-core/NGExtensions/Version | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/sope-core/NGExtensions/ChangeLog b/sope-core/NGExtensions/ChangeLog index 19f29486..1b0d826d 100644 --- a/sope-core/NGExtensions/ChangeLog +++ b/sope-core/NGExtensions/ChangeLog @@ -1,5 +1,8 @@ 2006-07-04 Helge Hess + * NGBundleManager.m: added more debug logs which can be triggered using + NGBundleManagerDebugEnabled (v4.5.186) + * 64bit fixes (v4.5.185) 2006-07-03 Helge Hess diff --git a/sope-core/NGExtensions/NGBundleManager.m b/sope-core/NGExtensions/NGBundleManager.m index f284ee95..edc1348e 100644 --- a/sope-core/NGExtensions/NGBundleManager.m +++ b/sope-core/NGExtensions/NGBundleManager.m @@ -825,7 +825,7 @@ static NSString *NGEnvVarPathSeparator = @":"; bundleInfo = [NSDictionary dictionaryWithContentsOfFile:_path]; #endif if (bundleInfo == nil) { - NSLog(@"couldn't load bundle-info at path '%@' !", _path); + NSLog(@"could not load bundle-info at path '%@' !", _path); return nil; } @@ -895,6 +895,8 @@ static NSString *NGEnvVarPathSeparator = @":"; NSDictionary *requires; NSMutableArray *requiredBundles = nil; NSBundle *requiredBundle = nil; + + if (debugOn) NSLog(@"NGBundleManager: preload bundle: %@", _bundle); requires = [_bundleInfo objectForKey:@"requires"]; @@ -948,6 +950,11 @@ static NSString *NGEnvVarPathSeparator = @":"; { NSEnumerator *e; + if (debugOn) { + NSLog(@"NGBundleManager: preload required bundles: %@", + requiredBundles); + } + e = [requiredBundles objectEnumerator]; while ((requiredBundle = [e nextObject]) != nil) { Class bundleMaster; @@ -1081,9 +1088,11 @@ static NSString *NGEnvVarPathSeparator = @":"; if (![self _preLoadBundle:_bundle info:bundleInfo]) goto done; - + + if (debugOn) NSLog(@"NGBundleManager: will load bundle: %@", _bundle); if (![_bundle _loadForBundleManager:self]) goto done; + if (debugOn) NSLog(@"NGBundleManager: did load bundle: %@", _bundle); if (![self _postLoadBundle:_bundle info:bundleInfo]) goto done; @@ -1958,7 +1967,7 @@ static BOOL _doesInfoMatch(NSArray *keys, NSDictionary *dict, NSDictionary *info providedByBundle:self]; } -// loading +/* loading */ - (BOOL)_loadForBundleManager:(NGBundleManager *)_manager { return [self load]; diff --git a/sope-core/NGExtensions/Version b/sope-core/NGExtensions/Version index 8ce1cdda..5619dc7c 100644 --- a/sope-core/NGExtensions/Version +++ b/sope-core/NGExtensions/Version @@ -1,6 +1,6 @@ # version -SUBMINOR_VERSION:=185 +SUBMINOR_VERSION:=186 # v4.3.115 requires libFoundation v1.0.59 # v4.2.72 requires libEOControl v4.2.39 -- 2.39.5