make beta support use upcoming Sparkle "tag" functionality - beta autoupdate is disabled for now

This commit is contained in:
Mitchell Livingston 2009-01-13 04:51:11 +00:00
parent 30c47d3b6f
commit 4c6f21da1e
6 changed files with 14 additions and 125 deletions

View File

@ -71,10 +71,8 @@
</array>
<key>SUAllowsAutomaticUpdates</key>
<false/>
<key>AppcastRelease</key>
<key>SUFeedURL</key>
<string>http://www.transmissionbt.com/appcast.xml</string>
<key>AppcastBeta</key>
<string>http://www.transmissionbt.com/appcast_beta.xml</string>
<key>SUPublicDSAKeyFile</key>
<string>sparkle_dsa_pub.pem</string>
<key>SUScheduledCheckInterval</key>

View File

@ -65,7 +65,7 @@
+ (void) setHandle: (tr_session *) handle;
+ (tr_session *) handle;
- (void) updateAppcastURL: (id) sender;
- (void) setAutoUpdateToBeta: (id) sender;
- (void) setPort: (id) sender;
- (void) randomPort: (id) sender;

View File

@ -150,7 +150,7 @@ tr_session * fHandle;
[fDefaults removeObjectForKey: @"CheckForUpdates"];
}
[self updateAppcastURL: nil];
[self setAutoUpdateToBeta: nil];
}
return self;
@ -338,15 +338,16 @@ tr_session * fHandle;
TOOLBAR_PEERS, TOOLBAR_NETWORK, TOOLBAR_REMOTE, nil];
}
#warning add custom Sparkle to support this; reenable in XIB
//for a beta release, always use the beta appcast
#if defined(BETA_RELEASE)
#define APPCAST_URL @"AppcastBeta"
#define SPARKLE_TAG YES
#else
#define APPCAST_URL ([[NSUserDefaults standardUserDefaults] boolForKey: @"AutoUpdateBeta"] ? @"AppcastBeta" : @"AppcastRelease")
#define SPARKLE_TAG [fDefaults boolForKey: @"AutoUpdateBeta"]
#endif
- (void) updateAppcastURL: (id) sender
- (void) setAutoUpdateToBeta: (id) sender
{
[[SUUpdater sharedUpdater] setFeedURL: [NSURL URLWithString: [[[NSBundle mainBundle] infoDictionary] objectForKey: APPCAST_URL]]];
[[SUUpdater sharedUpdater] setAllowedTags: SPARKLE_TAG ? [NSSet setWithObject: @"beta"] : nil];
}
- (void) setPort: (id) sender

View File

@ -1,25 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle">
<channel>
<title>Transmission Appcast</title>
<link>http://www.transmissionbt.com/appcast.xml</link>
<description>Most recent version available.</description>
<language>en</language>
<pubDate>Wed, 24 Dec 2008 12:30:00 -0400</pubDate>
<item>
<title>Transmission 1.42</title>
<sparkle:releaseNotesLink>http://www.transmissionbt.com/appcast/releasenotes.html</sparkle:releaseNotesLink>
<pubDate>Wed, 24 Dec 2008 12:30:00 -0400</pubDate>
<enclosure
url="http://mirrors.m0k.org/transmission/files/Transmission-1.42.dmg"
sparkle:version="7494"
sparkle:shortVersionString="1.42"
sparkle:dsaSignature="MC0CFDGYBe/7/7bAtZXeOqYO26iKrNJMAhUAiHvc+yWm071G/wnKsbOXUlzAgoM="
length="3674660"
type="application/octet-stream"/>
<sparkle:minimumSystemVersion>10.4.11"</sparkle:minimumSystemVersion>
</item>
</channel>
</rss>

View File

@ -1,66 +0,0 @@
<html>
<head>
<meta http-equiv="content-type" content="text/html;charset=utf-8">
<title>What's new in Transmission?</title>
<meta name="robots" content="anchors">
<link href="releasenotes.css" type="text/css" rel="stylesheet" media="all">
</head>
<body>
<br />
<table class="dots" width="100%" border="0" cellspacing="0" cellpadding="0" summary="Two column table with heading">
<tr>
<td class="blue">
<h3>1.42 Core Changes</h3>
</td>
</tr>
<tr>
<td>
<ul>
<li>Fix 1.41 lockup issue</li>
</ul>
</td>
</tr>
</table>
<br>
<table class="dots" width="100%" border="0" cellspacing="0" cellpadding="0" summary="Two column table with heading">
<tr>
<td class="blue">
<h3>1.41 Core Changes</h3>
</td>
</tr>
<tr>
<td>
<ul>
<li>Better peer management in large swarms</li>
<li>Support BitTorrent Enhancement Proposal (BEP) #21 "Extension for Partial Seeds"</li>
<li>Partial support for BEP #6 "Fast Extension" (reject, have all/none)</li>
<li>Honor the peer's BEP #10 reqq key, when available</li>
<li>Fix 1.40 "Got HTTP Status Code: 0" error message</li>
<li>Fix 1.40 "lazy bitfield" error</li>
<li>Fix 1.40 "jumpy upload speed" bug</li>
<li>Fix handshake peer_id error</li>
<li>Corrrectly handle Windows-style newlines in Bluetack blocklists</li>
<li>More accurate bandwidth measurement</li>
<li>File selection & priority was reset when editing a torrent's tracker list</li>
</ul>
</td>
</tr>
</table>
<p>For a full list of changes, <a href="http://trac.transmissionbt.com/query?milestone=1.41&group=component&groupdesc=1&order=severity">click here</a>.</p>
<table class="dots" width="100%" border="0" cellspacing="0" cellpadding="0" summary="Two column table with heading">
<tr>
<td class="red">
<h3>Note</h3>
</td>
</tr>
<tr>
<td>
<p>Transmission requires at least Mac OS X 10.4.11 with Security Update 2008-002. Mac OS X 10.5 or greater is highly recommended.</p>
</td>
</tr>
</table>
</body>
</html>

View File

@ -3069,6 +3069,7 @@ zcfN584IzijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE0
</object>
<string key="NSFrame">{{1, 1}, {141, 169}}</string>
<reference key="NSSuperview" ref="544077474"/>
<reference key="NSNextKeyView" ref="638525082"/>
<reference key="NSDocView" ref="638525082"/>
<reference key="NSBGColor" ref="729660797"/>
<int key="NScvFlags">4</int>
@ -3096,6 +3097,7 @@ zcfN584IzijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE0
</object>
<string key="NSFrame">{{20, 49}, {143, 171}}</string>
<reference key="NSSuperview" ref="284666863"/>
<reference key="NSNextKeyView" ref="568562479"/>
<int key="NSsFlags">530</int>
<reference key="NSVScroller" ref="287972127"/>
<reference key="NSHScroller" ref="781866080"/>
@ -5534,11 +5536,6 @@ AAABAAAAAQ</bytes>
<string key="NSExtension">NSResponder</string>
</object>
<object class="NSUserDefaultsController" id="356871564">
<object class="NSMutableArray" key="NSDeclaredKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>AutoUpdateBeta</string>
<string>SUEnableAutomaticChecks</string>
</object>
<bool key="NSSharedInstance">YES</bool>
</object>
<object class="NSCustomObject" id="981493640">
@ -8731,29 +8728,13 @@ AAABAAAAAQ</bytes>
</object>
<int key="connectionID">1897</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">enabled: values.SUEnableAutomaticChecks</string>
<reference key="source" ref="1005555131"/>
<reference key="destination" ref="356871564"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="1005555131"/>
<reference key="NSDestination" ref="356871564"/>
<string key="NSLabel">enabled: values.SUEnableAutomaticChecks</string>
<string key="NSBinding">enabled</string>
<string key="NSKeyPath">values.SUEnableAutomaticChecks</string>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
<int key="connectionID">1898</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">updateAppcastURL:</string>
<string key="label">setAutoUpdateToBeta:</string>
<reference key="source" ref="511492310"/>
<reference key="destination" ref="1005555131"/>
</object>
<int key="connectionID">1899</int>
<int key="connectionID">1900</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
@ -12551,7 +12532,7 @@ AAABAAAAAQ</bytes>
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">1899</int>
<int key="maxID">1900</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -12706,6 +12687,7 @@ AAABAAAAAQ</bytes>
<string>setAutoImport:</string>
<string>setAutoSize:</string>
<string>setAutoSpeedLimit:</string>
<string>setAutoUpdateToBeta:</string>
<string>setBadge:</string>
<string>setBlocklistAutoUpdate:</string>
<string>setBlocklistEnabled:</string>
@ -12738,7 +12720,6 @@ AAABAAAAAQ</bytes>
<string>setSpeedLimit:</string>
<string>setStalled:</string>
<string>setStalledMinutes:</string>
<string>updateAppcastURL:</string>
<string>updateBlocklist:</string>
</object>
<object class="NSMutableArray" key="dict.values">