Changeset 3257

Timestamp:

06/06/06 02:45:06 (2 years ago)

Author:

timothy

Message:

Switch over to use Sparkle to report application updates. Also build numbers are now SVN revision numbers, automatically set with an Xcode script.

Files:

• trunk/Colloquy.xcodeproj/project.pbxproj (modified) (14 diffs)
• trunk/Controllers/MVApplicationController.h (modified) (1 diff)
• trunk/Controllers/MVApplicationController.m (modified) (4 diffs)
• trunk/Controllers/MVSoftwareUpdate.h (deleted)
• trunk/Controllers/MVSoftwareUpdate.m (deleted)
• trunk/Frameworks/frameworks.tar.gz (modified) (previous)
• trunk/Resources/Info.plist (modified) (2 diffs)

trunk/Colloquy.xcodeproj/project.pbxproj

@@ -50 +50 @@
-                1C2462A505F9205900505752 /* JVStyleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C2462A305F9205900505752 /* JVStyleView.m */; };
-                1C2E98C406207AD0000715D8 /* half-op.png in Resources */ = {isa = PBXBuildFile; fileRef = 1C2E98C306207AD0000715D8 /* half-op.png */; };
+                1C2EDD790A3551B70051E9C2 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C2EDD660A3551B60051E9C2 /* Sparkle.framework */; };
+                1C2EDDA10A35530F0051E9C2 /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 1C2EDD660A3551B60051E9C2 /* Sparkle.framework */; };
-                1C3972DE082D30D200DCF3CF /* JVChatTranscriptBrowserPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C3972DC082D30D200DCF3CF /* JVChatTranscriptBrowserPanel.m */; };
-                1C39736A082D3ED000DCF3CF /* JVChatTranscriptBrowserPanel.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1C397368082D3ED000DCF3CF /* JVChatTranscriptBrowserPanel.nib */; };
@@ -79 +81 @@
-                1C710A0209F23730007B4515 /* JVSidebarChatWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C710A0009F23730007B4515 /* JVSidebarChatWindowController.m */; };
-                1C710A2009F2396C007B4515 /* JVSidebarChatWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1C710A1F09F2396C007B4515 /* JVSidebarChatWindow.nib */; };
-                1C710A6B09F23AF0007B4515 /* JVSideSplitView.h in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 1C710A6509F23AF0007B4515 /* JVSideSplitView.h */; };
-                1C710A6C09F23AF0007B4515 /* JVSideSplitView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C710A6609F23AF0007B4515 /* JVSideSplitView.m */; };
-                1C710A6D09F23AF0007B4515 /* JVSideStatusView.h in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 1C710A6709F23AF0007B4515 /* JVSideStatusView.h */; };
-                1C710A6E09F23AF0007B4515 /* JVSideStatusView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C710A6809F23AF0007B4515 /* JVSideStatusView.m */; };
-                1C710A6F09F23AF0007B4515 /* JVSideOutlineView.h in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 1C710A6909F23AF0007B4515 /* JVSideOutlineView.h */; };
-                1C710A7009F23AF0007B4515 /* JVSideOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C710A6A09F23AF0007B4515 /* JVSideOutlineView.m */; };
-                1C710ABE09F23D9C007B4515 /* sidebarActionWidget.png in Resources */ = {isa = PBXBuildFile; fileRef = 1C710ABA09F23D9C007B4515 /* sidebarActionWidget.png */; };
@@ -194 +193 @@
-                1CB2CD65052DDC560094AAA4 /* MVTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = F599994901890E4601EE70DE /* MVTextView.m */; };
-                1CB2CD67052DDC560094AAA4 /* MVCrashCatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = F555208701F0DC2B01EE70DE /* MVCrashCatcher.m */; };
-                1CB2CD68052DDC560094AAA4 /* MVSoftwareUpdate.m in Sources */ = {isa = PBXBuildFile; fileRef = F5BEC21401F2256301EE70DE /* MVSoftwareUpdate.m */; };
-                1CB2CD69052DDC560094AAA4 /* MVKeyChain.m in Sources */ = {isa = PBXBuildFile; fileRef = F551EE490209FB3301EE70DE /* MVKeyChain.m */; };
-                1CB2CD6A052DDC560094AAA4 /* MVFileTransferController.m in Sources */ = {isa = PBXBuildFile; fileRef = F51A4F2B01C2DDD201EE70DE /* MVFileTransferController.m */; };
@@ -416 +414 @@
-                                1C6C75490630AD9500698F55 /* AGRegex.framework in Copy Frameworks */,
-                                1CF5F8DD07D537F70019DC13 /* Growl.framework in Copy Frameworks */,
-
-
-
+
-                        );
-                        name = "Copy Frameworks";
@@ -510 +506 @@
-                1C2E98C306207AD0000715D8 /* half-op.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "half-op.png"; path = "Resources/half-op.png"; sourceTree = "<group>"; };
-                1C2E98C506207AE1000715D8 /* half-op-idle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "half-op-idle.png"; path = "Resources/half-op-idle.png"; sourceTree = "<group>"; };
+                1C2EDD660A3551B60051E9C2 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Frameworks/Sparkle.framework; sourceTree = SOURCE_ROOT; };
-                1C2EF7EB0427A40B00000102 /* MVChatPluginManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MVChatPluginManager.h; path = "Chat Core/MVChatPluginManager.h"; sourceTree = "<group>"; };
-                1C3972DB082D30D200DCF3CF /* JVChatTranscriptBrowserPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JVChatTranscriptBrowserPanel.h; path = Panels/JVChatTranscriptBrowserPanel.h; sourceTree = "<group>"; };
@@ -981 +978 @@
-                F5BEC20D01F1EF1901EE70DE /* admin.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = admin.png; path = Resources/admin.png; sourceTree = "<group>"; };
-                F5BEC20E01F1EF1901EE70DE /* admin-idle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "admin-idle.png"; path = "Resources/admin-idle.png"; sourceTree = "<group>"; };
-                F5BEC21401F2256301EE70DE /* MVSoftwareUpdate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MVSoftwareUpdate.m; path = Controllers/MVSoftwareUpdate.m; sourceTree = "<group>"; };
-                F5BEC21501F2256301EE70DE /* MVSoftwareUpdate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MVSoftwareUpdate.h; path = Controllers/MVSoftwareUpdate.h; sourceTree = "<group>"; };
-                F5C3D42303973E7B01000102 /* addWidget.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = addWidget.png; sourceTree = "<group>"; };
-                F5C3D42403973E7B01000102 /* addWidgetSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = addWidgetSelected.png; sourceTree = "<group>"; };
@@ -1060 +1055 @@
-                                1CEEAB17095BD23500166A54 /* ChatCore.framework in Frameworks */,
-                                1CC1AE630A2987E20000A797 /* sqlite3.a in Frameworks */,
+                                1C2EDD790A3551B70051E9C2 /* Sparkle.framework in Frameworks */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
@@ -1131 +1127 @@
-                                1CF8030D070C893500C9B54C /* libsilcclient.framework */,
-                                1CF5F8D107D537E50019DC13 /* Growl.framework */,
+                                1C2EDD660A3551B60051E9C2 /* Sparkle.framework */,
-                                1CC1AE400A2987230000A797 /* sqlite3.a */,
-                        );
@@ -1506 +1503 @@
-                                F555208701F0DC2B01EE70DE /* MVCrashCatcher.m */,
-                                F555208801F0DC2B01EE70DE /* MVCrashCatcher.h */,
-                                F5BEC21401F2256301EE70DE /* MVSoftwareUpdate.m */,
-                                F5BEC21501F2256301EE70DE /* MVSoftwareUpdate.h */,
-                        );
-                        name = Controllers;
@@ -1858 +1853 @@
-                                1CF038FF062F8DBB009774D8 /* Touch Styles & Emoticons */,
-                                1C91DEAC06972EC0007C1638 /* Remove Headers */,
+                                1C2EDE8B0A3568EF0051E9C2 /* Update Build Number */,
-                        );
-                        buildRules = (
@@ -2207 +2203 @@
-
-/* Begin PBXShellScriptBuildPhase section */
+                1C2EDE8B0A3568EF0051E9C2 /* Update Build Number */ = {
+                        isa = PBXShellScriptBuildPhase;
+                        buildActionMask = 2147483647;
+                        files = (
+                        );
+                        inputPaths = (
+                        );
+                        name = "Update Build Number";
+                        outputPaths = (
+                        );
+                        runOnlyForDeploymentPostprocessing = 0;
+                        shellPath = /usr/bin/perl;
+                        shellScript = "# Xcode auto-versioning script for Subversion\n# by Axel Andersson, modified by Daniel Jalkut\n\nuse strict;\n\ndie \"$0: Must be run from Xcode\" unless $ENV{\"BUILT_PRODUCTS_DIR\"};\n\n# Get the current subversion revision number and use it to set the CFBundleVersion value\nmy $REV = `/usr/local/bin/svnversion -n ./`;\nmy $INFO = \"$ENV{BUILT_PRODUCTS_DIR}/$ENV{WRAPPER_NAME}/Contents/Info.plist\";\n\nmy $version = $REV;\n\n# (Match the last group of digits and optional letter M/S):\n($version =~ m/\\d+[MS]*$/) && ($version = $&);\n\ndie \"$0: No Subversion revision found\" unless $version;\n\nopen(FH, \"$INFO\") or die \"$0: $INFO: $!\";\nmy $info = join(\"\", <FH>);\nclose(FH);\n\n$info =~ s/(\\s+<key>CFBundleVersion<\\/key>\\s+<string>).*?(<\\/string>)/$1$version$2/;\n\nopen(FH, \">$INFO\") or die \"$0: $INFO: $!\";\nprint FH $info;\nclose(FH);\n";
+                };
-                1C7A60B509FDE8560029AC64 /* Run Tests */ = {
-                        isa = PBXShellScriptBuildPhase;
@@ -2233 +2243 @@
-                        runOnlyForDeploymentPostprocessing = 0;
-                        shellPath = /bin/sh;
-print0 | xargs -0 rm -rf
+delete
-                };
-                1CAF6496099EA9350036A727 /* Unarchive Frameworks */ = {
@@ -2245 +2255 @@
-                        name = "Unarchive Frameworks";
-                        outputPaths = (
+                                "$(SRCROOT)/Frameworks/Sparkle.framework",
-                                "$(SRCROOT)/Frameworks/Growl.framework",
-                                "$(SRCROOT)/Frameworks/libsilc.framework",
@@ -2298 +2309 @@
-                                1CB2CD65052DDC560094AAA4 /* MVTextView.m in Sources */,
-                                1CB2CD67052DDC560094AAA4 /* MVCrashCatcher.m in Sources */,
-                                1CB2CD68052DDC560094AAA4 /* MVSoftwareUpdate.m in Sources */,
-                                1CB2CD69052DDC560094AAA4 /* MVKeyChain.m in Sources */,
-                                1CB2CD6A052DDC560094AAA4 /* MVFileTransferController.m in Sources */,

trunk/Controllers/MVApplicationController.h

@@ -4 +4 @@
-extern NSString *JVMachineStoppedIdlingNotification;
-
-JVChatTranscriptBrowserPanel
+SUUpdater
-
-@interface MVApplicationController : NSObject {
-        io_registry_entry_t _hidEntry;
-        NSTimer *_idleCheck;
+        SUUpdater *_updater;
-        NSTimeInterval _lastIdle;
-        BOOL _isIdle;

trunk/Controllers/MVApplicationController.m

@@ -4 +4 @@
-#import "JVChatWindowController.h"
-#import "MVCrashCatcher.h"
-#import "MVSoftwareUpdate.h"
-#import "JVInspectorController.h"
-#import "JVPreferencesController.h"
@@ -24 +23 @@
-#import "JVChatTranscriptBrowserPanel.h"
-
+#import <Sparkle/SUUpdater.h>
-#import <Foundation/NSDebug.h>
-
@@ -131 +131 @@
-
-- (IBAction) checkForUpdate:(id) sender {
-
+
+
-}
-
@@ -384 +385 @@
-        [MVCrashCatcher check];
-
-
-
+
+
+
+
+
-
-        [[MVColorPanel sharedColorPanel] attachColorList:[[[NSColorList alloc] initWithName:@"Chat" fromFile:[[NSBundle mainBundle] pathForResource:@"Chat" ofType:@"clr"]] autorelease]];

trunk/Resources/Info.plist

@@ -107 +107 @@
-        <string>10.3.9</string>
-        <key>CFBundleVersion</key>
-2D43 
+
-        <key>MVChatCoreCTCPVersionReplyInfo</key>
-        <string>http://colloquy.info</string>
@@ -203 +203 @@
-        <key>SmartCrashReports_URL</key>
-        <string>http://www.colloquy.info/crash.php</string>
+        <key>SUFeedURL</key>
+        <string>http://www.colloquy.info/update.php?rss</string>
+        <key>SUCheckAtStartup</key>
+        <false/>
+        <key>SUAllowsAutomaticUpdates</key>
+        <true/>
-</dict>
-</plist>