diff --git a/configure.ac b/configure.ac index 370c30d78..546add2e9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl convention: -TR MAJOR MINOR MAINT STATUS - (each a single char) -dnl STATUS: "X" for prerelease test builds, +dnl STATUS: "X" for prerelease beta builds, dnl "Z" for unsupported trunk builds, dnl "0" for stable, supported releases dnl these should be the only two lines you need to change diff --git a/macosx/Controller.m b/macosx/Controller.m index 23b225413..e8d20abc4 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -263,14 +263,6 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy SUUpdater * updater = [SUUpdater sharedUpdater]; [updater setDelegate: self]; fUpdateInProgress = NO; - - //reset old Sparkle settings from previous versions - [fDefaults removeObjectForKey: @"SUScheduledCheckInterval"]; - if ([fDefaults objectForKey: @"CheckForUpdates"]) - { - [updater setAutomaticallyChecksForUpdates: [fDefaults boolForKey: @"CheckForUpdates"]]; - [fDefaults removeObjectForKey: @"CheckForUpdates"]; - } } return self; } diff --git a/macosx/Defaults.plist b/macosx/Defaults.plist index 62a8efee3..ae705c347 100644 --- a/macosx/Defaults.plist +++ b/macosx/Defaults.plist @@ -8,6 +8,8 @@ AutoStartDownload + AutoUpdateBeta + BadgeDownloadRate BadgeUploadRate diff --git a/macosx/Info.plist b/macosx/Info.plist index 1cf3e4ec4..dfd3ba2fb 100644 --- a/macosx/Info.plist +++ b/macosx/Info.plist @@ -79,8 +79,10 @@ SUAllowsAutomaticUpdates - SUFeedURL + AppcastRelease http://www.transmissionbt.com/appcast.xml + AppcastBeta + http://www.transmissionbt.com/appcast_beta.xml SUPublicDSAKeyFile sparkle_dsa_pub.pem SUScheduledCheckInterval diff --git a/macosx/PrefsController.h b/macosx/PrefsController.h index 825cfe928..ab33a08b0 100644 --- a/macosx/PrefsController.h +++ b/macosx/PrefsController.h @@ -65,6 +65,8 @@ + (void) setHandle: (tr_session *) handle; + (tr_session *) handle; +- (void) updateAppcastURL: (id) sender; + - (void) setPort: (id) sender; - (void) randomPort: (id) sender; - (void) setNat: (id) sender; diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m index b6c9c4c59..ab89d37a8 100644 --- a/macosx/PrefsController.m +++ b/macosx/PrefsController.m @@ -31,6 +31,8 @@ #import "UKKQueue.h" #import "utils.h" +#import + #define DOWNLOAD_FOLDER 0 #define DOWNLOAD_TORRENT 2 @@ -139,6 +141,16 @@ tr_session * fHandle; if (!fRPCWhitelistArray) fRPCWhitelistArray = [[NSMutableArray arrayWithObject: @"127.0.0.1"] retain]; [self updateRPCWhitelist]; + + //reset old Sparkle settings from previous versions + [fDefaults removeObjectForKey: @"SUScheduledCheckInterval"]; + if ([fDefaults objectForKey: @"CheckForUpdates"]) + { + [[SUUpdater sharedUpdater] setAutomaticallyChecksForUpdates: [fDefaults boolForKey: @"CheckForUpdates"]]; + [fDefaults removeObjectForKey: @"CheckForUpdates"]; + } + + [self updateAppcastURL: nil]; } return self; @@ -326,6 +338,17 @@ tr_session * fHandle; TOOLBAR_PEERS, TOOLBAR_NETWORK, TOOLBAR_REMOTE, nil]; } +//for a beta release, always use the beta appcast +#if defined(BETA_RELEASE) +#define APPCAST_URL @"AppcastBeta" +#else +#define APPCAST_URL ([[NSUserDefaults standardUserDefaults] boolForKey: @"AutoUpdateBeta"] ? @"AppcastBeta" : @"AppcastRelease") +#endif +- (void) updateAppcastURL: (id) sender +{ + [[SUUpdater sharedUpdater] setFeedURL: [NSURL URLWithString: [[[NSBundle mainBundle] infoDictionary] objectForKey: APPCAST_URL]]]; +} + - (void) setPort: (id) sender { int port = [sender intValue]; diff --git a/macosx/appcast/appcast_beta.xml b/macosx/appcast/appcast_beta.xml new file mode 100644 index 000000000..2aae217a0 --- /dev/null +++ b/macosx/appcast/appcast_beta.xml @@ -0,0 +1,25 @@ + + + + Transmission Appcast + http://www.transmissionbt.com/appcast.xml + Most recent version available. + en + Wed, 24 Dec 2008 12:30:00 -0400 + + + Transmission 1.42 + http://www.transmissionbt.com/appcast/releasenotes.html + Wed, 24 Dec 2008 12:30:00 -0400 + + + + + diff --git a/macosx/appcast/releasenotes_beta.html b/macosx/appcast/releasenotes_beta.html new file mode 100644 index 000000000..87b4587a8 --- /dev/null +++ b/macosx/appcast/releasenotes_beta.html @@ -0,0 +1,66 @@ + + + + + What's new in Transmission? + + + + + +
+ + + + + + + +
+

1.42 Core Changes

+
+
    +
  • Fix 1.41 lockup issue
    • +
+
+
+ + + + + + + +
+

1.41 Core Changes

+
+
    +
  • Better peer management in large swarms
    • +
  • Support BitTorrent Enhancement Proposal (BEP) #21 "Extension for Partial Seeds"
    • +
  • Partial support for BEP #6 "Fast Extension" (reject, have all/none)
    • +
  • Honor the peer's BEP #10 reqq key, when available
    • +
  • Fix 1.40 "Got HTTP Status Code: 0" error message
    • +
  • Fix 1.40 "lazy bitfield" error
    • +
  • Fix 1.40 "jumpy upload speed" bug
    • +
  • Fix handshake peer_id error
    • +
  • Corrrectly handle Windows-style newlines in Bluetack blocklists
    • +
  • More accurate bandwidth measurement
    • +
  • File selection & priority was reset when editing a torrent's tracker list
    • +
+
+

For a full list of changes, click here.

+ + + + + + + +
+

Note

+
+

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.

+
+ + + diff --git a/macosx/en.lproj/PrefsWindow.xib b/macosx/en.lproj/PrefsWindow.xib index d537ba8a4..57a5b4c44 100644 --- a/macosx/en.lproj/PrefsWindow.xib +++ b/macosx/en.lproj/PrefsWindow.xib @@ -8,9 +8,7 @@ 353.00 YES - - - + YES @@ -56,14 +54,14 @@ {3.40282e+38, 3.40282e+38} - + 256 YES 256 - {{189, 101}, {181, 18}} + {{189, 120}, {181, 18}} YES @@ -94,7 +92,7 @@ 256 - {{189, 141}, {193, 18}} + {{189, 160}, {193, 18}} YES @@ -116,7 +114,7 @@ 256 - {{78, 142}, {108, 17}} + {{78, 161}, {108, 17}} YES @@ -148,7 +146,7 @@ 256 - {{42, 198}, {144, 17}} + {{42, 217}, {144, 17}} YES @@ -164,7 +162,7 @@ 256 - {{189, 197}, {149, 18}} + {{189, 216}, {149, 18}} YES @@ -186,7 +184,7 @@ 256 - {{189, 177}, {131, 18}} + {{189, 196}, {131, 18}} YES @@ -208,7 +206,7 @@ 256 - {{208, 121}, {258, 18}} + {{208, 140}, {258, 18}} YES @@ -230,7 +228,7 @@ 256 - {{208, 81}, {258, 18}} + {{208, 100}, {258, 18}} YES @@ -252,7 +250,7 @@ 256 - {{106, 235}, {80, 17}} + {{106, 254}, {80, 17}} YES @@ -268,7 +266,7 @@ 256 - {{189, 234}, {303, 18}} + {{189, 253}, {303, 18}} YES @@ -290,7 +288,7 @@ 256 - {{288, 49}, {82, 32}} + {{288, 68}, {82, 32}} YES @@ -313,7 +311,7 @@ 256 - {{188, 59}, {101, 17}} + {{188, 78}, {101, 17}} YES @@ -329,7 +327,7 @@ 256 - {{189, 19}, {183, 18}} + {{189, 38}, {183, 18}} YES @@ -348,10 +346,32 @@ 25 + + + 256 + {{208, 18}, {155, 18}} + + YES + + 67239424 + 0 + Include beta releases + + + 1211912703 + 2 + + + + + 200 + 25 + + 256 - {{69, 20}, {117, 17}} + {{69, 39}, {117, 17}} YES @@ -365,7 +385,8 @@ - {535, 272} + {535, 291} + NSView NSResponder @@ -1528,7 +1549,7 @@ NSResponder - + 256 YES @@ -3048,7 +3069,6 @@ zcfN584IzijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE0 {{1, 1}, {141, 169}} - 4 @@ -3076,7 +3096,6 @@ zcfN584IzijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE0 {{20, 49}, {143, 171}} - 530 @@ -3343,11 +3362,10 @@ zcfN584IzijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE0 {535, 240} - NSView - + 256 YES @@ -3937,7 +3955,6 @@ AAABAAAAAQ {535, 226} - NSView NSResponder @@ -4400,7 +4417,7 @@ AAABAAAAAQ NSResponder - + 256 YES @@ -5031,7 +5048,6 @@ AAABAAAAAQ {535, 345} - NSView NSResponder @@ -5518,6 +5534,11 @@ AAABAAAAAQ NSResponder + + YES + AutoUpdateBeta + SUEnableAutomaticChecks + YES @@ -8694,6 +8715,46 @@ AAABAAAAAQ 1894 + + + value: values.AutoUpdateBeta + + + + + + value: values.AutoUpdateBeta + value + values.AutoUpdateBeta + 2 + + + 1897 + + + + enabled: values.SUEnableAutomaticChecks + + + + + + enabled: values.SUEnableAutomaticChecks + enabled + values.SUEnableAutomaticChecks + 2 + + + 1898 + + + + updateAppcastURL: + + + + 1899 + @@ -8758,6 +8819,7 @@ AAABAAAAAQ + General @@ -11321,6 +11383,20 @@ AAABAAAAAQ + + 1895 + + + YES + + + + + + 1896 + + + @@ -11683,6 +11759,9 @@ AAABAAAAAQ 1891.IBPluginDependency 1891.ImportedFromIB2 1892.IBPluginDependency + 1895.IBPluginDependency + 1895.ImportedFromIB2 + 1896.IBPluginDependency 190.IBPluginDependency 190.ImportedFromIB2 192.IBPluginDependency @@ -12242,6 +12321,9 @@ AAABAAAAAQ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -12317,7 +12399,7 @@ AAABAAAAAQ com.apple.InterfaceBuilder.CocoaPlugin - {{24, 399}, {535, 272}} + {{242, 542}, {535, 291}} com.apple.InterfaceBuilder.CocoaPlugin {{0, 701}, {539, 272}} @@ -12469,7 +12551,7 @@ AAABAAAAAQ - 1894 + 1899 @@ -12656,6 +12738,7 @@ AAABAAAAAQ setSpeedLimit: setStalled: setStalledMinutes: + updateAppcastURL: updateBlocklist: @@ -12708,6 +12791,7 @@ AAABAAAAAQ id id id + id diff --git a/macosx/version.sh b/macosx/version.sh index 6d988867e..8ae659747 100755 --- a/macosx/version.sh +++ b/macosx/version.sh @@ -3,7 +3,7 @@ # $Id$ # convention: -TR MAJOR MINOR MAINT STATUS - (each a single char) -# STATUS: "X" for prerelease test builds, +# STATUS: "X" for prerelease beta builds, # "Z" for unsupported trunk builds, # "0" for stable, supported releases # these should be the only two lines you need to change @@ -37,6 +37,14 @@ cat > libtransmission/version.h.new << EOF #define VERSION_STRING_INFOPLIST $USERAGENT_PREFIX #define BUNDLE_VERSION_INFOPLIST $SVN_REVISION EOF + +# Check if it's a beta release +if [ ${PEERID_PREFIX:6:1} = X ]; then +cat >> libtransmission/version.h.new << EOF +#define BETA_RELEASE "BETA" +EOF +fi + replace_if_differs libtransmission/version.h.new libtransmission/version.h exit 0