Changeset 152

Timestamp:

04/28/08 14:10:20 (3 weeks ago)

Author:

andym

Message:

Added fetching of CFBundleName as a fallback for CFBundleDisplayName in -[NSBundle(SUAdditions) name].
Fixed an uninitialized variable.
Fixed autorelease pool errors during installation thread.
Fixed error including SUInstaller.h from host app.
Patch courtesy Ben Kazez.

Files:

• trunk/NSBundle+SUAdditions.m (modified) (1 diff)
• trunk/SUInstaller.m (modified) (2 diffs)
• trunk/SUPackageInstaller.m (modified) (1 diff)
• trunk/SUPlainInstaller.m (modified) (1 diff)
• trunk/Sparkle.xcodeproj/project.pbxproj (modified) (5 diffs)

trunk/NSBundle+SUAdditions.m

@@ -15 +15 @@
-{
-        NSString *name = [self objectForInfoDictionaryKey:@"CFBundleDisplayName"];
-
-
-
-
+
+
+
+
+
+
-}
-

trunk/SUInstaller.m

@@ -20 +20 @@
-{
-        // Search subdirectories for the application
-
+, *alternateBundleFileName = [[hostBundle name] stringByAppendingPathExtension:[[hostBundle bundlePath] pathExtension]]
-        BOOL isPackage = NO;
-        NSDirectoryEnumerator *dirEnum = [[NSFileManager defaultManager] enumeratorAtPath:updateFolder];
@@ -26 +26 @@
-        {
-                NSString *currentPath = [updateFolder stringByAppendingPathComponent:currentFile];              
-
+
+
-                {
-                        isPackage = NO;

trunk/SUPackageInstaller.m

@@ -14 +14 @@
-+ (void)installPath:(NSString *)path overHostBundle:(NSBundle *)bundle delegate:delegate
-{
-
+ = nil
-        BOOL result = YES;
-        

trunk/SUPlainInstaller.m

@@ -21 +21 @@
-+ (void)performInstallationWithInfo:(NSDictionary *)info
-{
+        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
-        [self installPath:[info objectForKey:SUInstallerPathKey] overHostBundle:[info objectForKey:SUInstallerHostBundleKey] delegate:[info objectForKey:SUInstallerDelegateKey]];
+        
+        [pool release];
-}
-

trunk/Sparkle.xcodeproj/project.pbxproj

@@ -37 +37 @@
-                6171D9070D57B81800BFE886 /* NSFileManager+Aliases.h in Headers */ = {isa = PBXBuildFile; fileRef = 6171D9050D57B81800BFE886 /* NSFileManager+Aliases.h */; settings = {ATTRIBUTES = (Public, ); }; };
-                6171D9080D57B81800BFE886 /* NSFileManager+Aliases.m in Sources */ = {isa = PBXBuildFile; fileRef = 6171D9060D57B81800BFE886 /* NSFileManager+Aliases.m */; };
-
+settings = {ATTRIBUTES = (Public, ); }; 
-                618FA5020DAE88B40026945C /* SUInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 618FA5000DAE88B40026945C /* SUInstaller.m */; };
-                618FA5050DAE8AB80026945C /* SUPlainInstaller.h in Headers */ = {isa = PBXBuildFile; fileRef = 618FA5030DAE8AB80026945C /* SUPlainInstaller.h */; };
@@ -82 +82 @@
-                DAAEFC9B0DA5722F0051E0D0 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; };
-                DAAEFD4E0DA572330051E0D0 /* relaunch.m in Sources */ = {isa = PBXBuildFile; fileRef = 613242130CD06CEF00106AA4 /* relaunch.m */; };
-CopyFil
+Resourc
-                FAEFA2F70D94AA7500472538 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; };
-                FAEFA2F80D94AA7900472538 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; };
@@ -128 +128 @@
-                        files = (
-                                61407C390A4099050009F71F /* Sparkle.framework in CopyFiles */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
-                };
-                DA142A520CC79E5A00CE54F3 /* CopyFiles */ = {
-                        isa = PBXCopyFilesBuildPhase;
-                        buildActionMask = 2147483647;
-                        dstPath = "";
-                        dstSubfolderSpec = 7;
-                        files = (
-                                DAAEFD510DA572550051E0D0 /* relaunch in CopyFiles */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
@@ -646 +636 @@
-                                8DC2EF540486A6940098B216 /* Sources */,
-                                8DC2EF560486A6940098B216 /* Frameworks */,
-                                DA142A520CC79E5A00CE54F3 /* CopyFiles */,
-                        );
-                        buildRules = (
@@ -751 +740 @@
-                        buildActionMask = 2147483647;
-                        files = (
+                                DAAEFD510DA572550051E0D0 /* relaunch in Resources */,
-                                610D5A750A1670A4004AAD9C /* SUStatus.nib in Resources */,
-                                61AAE8280A321A7F00D8810D /* Sparkle.strings in Resources */,