diff --git a/SUAppcastItem.h b/SUAppcastItem.h index d1067321a..010e50bb9 100644 --- a/SUAppcastItem.h +++ b/SUAppcastItem.h @@ -33,8 +33,8 @@ } // Initializes with data from a dictionary provided by the RSS class. -- initWithDictionary:(NSDictionary *)dict; -- initWithDictionary:(NSDictionary *)dict failureReason:(NSString**)error; +- (id)initWithDictionary:(NSDictionary *)dict; +- (id)initWithDictionary:(NSDictionary *)dict failureReason:(NSString**)error; - (NSString *)title; - (NSString *)versionString; diff --git a/SUUpdater.h b/SUUpdater.h index ff04620c7..cd7956673 100644 --- a/SUUpdater.h +++ b/SUUpdater.h @@ -27,12 +27,12 @@ + (SUUpdater *)sharedUpdater; + (SUUpdater *)updaterForBundle:(NSBundle *)bundle; -- initForBundle:(NSBundle *)bundle; +- (id)initForBundle:(NSBundle *)bundle; - (NSBundle *)hostBundle; - (void)setDelegate:(id)delegate; -- delegate; +- (id)delegate; - (void)setAutomaticallyChecksForUpdates:(BOOL)automaticallyChecks; - (BOOL)automaticallyChecksForUpdates; diff --git a/Sparkle.pch b/Sparkle.pch index 9bd4777fd..b37a52ce4 100644 --- a/Sparkle.pch +++ b/Sparkle.pch @@ -20,6 +20,64 @@ #ifdef __OBJC__ +#define ClassPrefix BRGM + +#ifdef ClassPrefix +#define _ClassPrefix_CONCAT_2(c,d) c ## d +#define _ClassPrefix_CONCAT(a,b) _ClassPrefix_CONCAT_2(a,b) +#define ClassPrefix_PREPEND(x) _ClassPrefix_CONCAT(ClassPrefix, x) + +//Update Control +#define SUUpdater ClassPrefix_PREPEND(SUUpdater) +//Drivers +#define SUUpdateDriver ClassPrefix_PREPEND(SUUpdateDriver) +#define SUBasicUpdateDriver ClassPrefix_PREPEND(SUBasicUpdateDriver) +#define SUUIBasedUpdateDriver ClassPrefix_PREPEND(SUUIBasedUpdateDriver) +#define SUAutomaticUpdateDriver ClassPrefix_PREPEND(SUAutomaticUpdateDriver) +#define SUScheduledUpdateDriver ClassPrefix_PREPEND(SUScheduledUpdateDriver) +#define SUProbingUpdateDriver ClassPrefix_PREPEND(SUProbingUpdateDriver) +#define SUUserInitiatedUpdateDriver ClassPrefix_PREPEND(SUUserInitiatedUpdateDriver) +//Support +#define SUDSAVerifier ClassPrefix_PREPEND(SUDSAVerifier) + +//Appcast Support +#define SUAppcast ClassPrefix_PREPEND(SUAppcast) +#define SUAppcastExtensions ClassPrefix_PREPEND(SUAppcastExtensions) +#define SUAppcastItem ClassPrefix_PREPEND(SUAppcastItem) +#define SUSystemProfiler ClassPrefix_PREPEND(SUSystemProfiler) +#define SUVersionComparison ClassPrefix_PREPEND(SUVersionComparison) +#define SUStandardVersionComparator ClassPrefix_PREPEND(SUStandardVersionComparator) + +//Installation +#define SUInstaller ClassPrefix_PREPEND(SUInstaller) +#define SUPlainInstaller ClassPrefix_PREPEND(SUPlainInstaller) +#define SUPlainInstallerInternals ClassPrefix_PREPEND(SUPlainInstallerInternals) +#define SUPackageInstaller ClassPrefix_PREPEND(SUPackageInstaller) + + +//Unarchiving +//Binary Delta +#define SUBinaryDeltaUnarchiver ClassPrefix_PREPEND(SUBinaryDeltaUnarchiver) + +#define SUUnarchiver ClassPrefix_PREPEND(SUUnarchiver) +#define SUPipedUnarchiver ClassPrefix_PREPEND(SUPipedUnarchiver) +#define SUDiskImageUnarchiver ClassPrefix_PREPEND(SUDiskImageUnarchiver) +#define NTSynchronousTask ClassPrefix_PREPEND(NTSynchronousTask) + + +//User Interface +#define SUUpdateAlert ClassPrefix_PREPEND(SUUpdateAlert) +#define SUAutomaticUpdateAlert ClassPrefix_PREPEND(SUAutomaticUpdateAlert) +#define SUStatusController ClassPrefix_PREPEND(SUStatusController) +#define SUUpdatePermissionPrompt ClassPrefix_PREPEND(SUUpdatePermissionPrompt) +#define SUWindowController ClassPrefix_PREPEND(SUWindowController) + + +//Other Sources +#define SUHost ClassPrefix_PREPEND(SUHost) + +#endif + #define SPARKLE_BUNDLE [NSBundle bundleWithIdentifier:@"org.andymatuschak.Sparkle"] #define SULocalizedString(key,comment) NSLocalizedStringFromTableInBundle(key, @"Sparkle", SPARKLE_BUNDLE, comment) #define SUAbstractFail() NSAssert2(nil, @"Can't call %@ on an instance of %@; this is an abstract method!", __PRETTY_FUNCTION__, [self class]); diff --git a/Sparkle.xcodeproj/project.pbxproj b/Sparkle.xcodeproj/project.pbxproj index 3e5b84c6d..99b9fa3e2 100644 --- a/Sparkle.xcodeproj/project.pbxproj +++ b/Sparkle.xcodeproj/project.pbxproj @@ -32,7 +32,6 @@ 55C14F24136EF86F00649790 /* SUPackageInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 618FA5210DAE8E8A0026945C /* SUPackageInstaller.m */; }; 55C14F2A136EF9A900649790 /* SUWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61180BC90D64138900B4E0D1 /* SUWindowController.m */; }; 55C14F32136EFC2400649790 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55C14F31136EFC2400649790 /* SystemConfiguration.framework */; }; - 55C14F3B136EFCB300649790 /* finish_installation.app in Resources */ = {isa = PBXBuildFile; fileRef = 55C14BB7136EEF1500649790 /* finish_installation.app */; }; 55C14F7E136F005000649790 /* SUPlainInstallerInternals.m in Sources */ = {isa = PBXBuildFile; fileRef = 61B5F8E509C4CE3C00B25A18 /* SUPlainInstallerInternals.m */; }; 55C14F9A136F045400649790 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61B5F8F609C4CEB300B25A18 /* Security.framework */; }; 55C14FC7136F05E100649790 /* Sparkle.strings in Resources */ = {isa = PBXBuildFile; fileRef = 61AAE8220A321A7F00D8810D /* Sparkle.strings */; }; @@ -137,13 +136,6 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 55C14F96136F044100649790 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 55C14BB6136EEF1500649790; - remoteInfo = finish_installation; - }; 5D06E8D50FD68C86005AE3F6 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; @@ -877,7 +869,6 @@ buildRules = ( ); dependencies = ( - 55C14F97136F044100649790 /* PBXTargetDependency */, ); name = Sparkle; productInstallPath = "$(HOME)/Library/Frameworks"; @@ -891,7 +882,7 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0420; + LastUpgradeCheck = 0450; }; buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "Sparkle" */; compatibilityVersion = "Xcode 3.2"; @@ -991,7 +982,6 @@ 55C14BEF136EF21700649790 /* SUStatus.xib in Resources */, 55C14C04136EF26100649790 /* SUUpdateAlert.xib in Resources */, 55C14C19136EF2C700649790 /* SUUpdatePermissionPrompt.xib in Resources */, - 55C14F3B136EFCB300649790 /* finish_installation.app in Resources */, 93FB277F156BD826001937C7 /* SUPasswordPrompt.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1163,11 +1153,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 55C14F97136F044100649790 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 55C14BB6136EEF1500649790 /* finish_installation */; - targetProxy = 55C14F96136F044100649790 /* PBXContainerItemProxy */; - }; 5D06E8D60FD68C86005AE3F6 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 8DC2EF4F0486A6940098B216 /* Sparkle */; @@ -1336,6 +1321,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = FA1941CA0D94A70100DD942E /* ConfigFrameworkDebug.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; IBC_FLATTEN_NIBS = NO; }; name = Debug; @@ -1344,6 +1330,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = FA1941D50D94A70100DD942E /* ConfigFrameworkRelease.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; IBC_FLATTEN_NIBS = YES; }; name = Release; @@ -1367,6 +1354,7 @@ baseConfigurationReference = FA1941D30D94A70100DD942E /* ConfigRelaunchDebug.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_MODEL_TUNING = G5; @@ -1390,6 +1378,7 @@ baseConfigurationReference = FA1941D40D94A70100DD942E /* ConfigRelaunchRelease.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_MODEL_TUNING = G5; @@ -1413,6 +1402,7 @@ baseConfigurationReference = FA1941D40D94A70100DD942E /* ConfigRelaunchRelease.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + COMBINE_HIDPI_IMAGES = YES; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = finish_installation.pch; @@ -1460,6 +1450,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 61072EB20DF2640C008FE88B /* ConfigFrameworkReleaseGCSupport.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; IBC_FLATTEN_NIBS = YES; }; name = "Release (GC dual-mode; 10.5+)"; @@ -1468,6 +1459,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 615409A8103BA09100125AF1 /* ConfigTestAppReleaseGCSupport.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; }; name = "Release (GC dual-mode; 10.5+)"; }; @@ -1475,6 +1467,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = FA302AFD109D13190060F891 /* ConfigUnitTestReleaseGCSupport.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; }; name = "Release (GC dual-mode; 10.5+)"; }; @@ -1482,6 +1475,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = FA3AAF3A1050B273004B3130 /* ConfigUnitTestDebug.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; }; name = Debug; }; @@ -1489,6 +1483,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = FA3AAF391050B273004B3130 /* ConfigUnitTestRelease.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; }; name = Release; }; @@ -1496,6 +1491,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = FA1941CB0D94A70100DD942E /* ConfigTestAppDebug.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; }; name = Debug; }; @@ -1503,6 +1499,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = FA1941D20D94A70100DD942E /* ConfigTestAppRelease.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; }; name = Release; }; @@ -1517,6 +1514,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = FA1941D50D94A70100DD942E /* ConfigFrameworkRelease.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; IBC_FLATTEN_NIBS = NO; }; name = Beta; @@ -1525,6 +1523,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = FA1941D20D94A70100DD942E /* ConfigTestAppRelease.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; }; name = Beta; }; @@ -1532,6 +1531,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = FA3AAF391050B273004B3130 /* ConfigUnitTestRelease.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; }; name = Beta; }; @@ -1547,6 +1547,7 @@ baseConfigurationReference = FA1941D40D94A70100DD942E /* ConfigRelaunchRelease.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_MODEL_TUNING = G5; diff --git a/Sparkle.xcodeproj/xcshareddata/xcschemes/Sparkle.xcscheme b/Sparkle.xcodeproj/xcshareddata/xcschemes/Sparkle.xcscheme index f81adc7d7..9b8b9ad78 100644 --- a/Sparkle.xcodeproj/xcshareddata/xcschemes/Sparkle.xcscheme +++ b/Sparkle.xcodeproj/xcshareddata/xcschemes/Sparkle.xcscheme @@ -1,5 +1,6 @@ @@ -77,7 +78,7 @@