Adjust CFBundleVersion format to fix Sparkle update check
Set the first version component to be the same as the last Subversion-based release build version and add two more components (major and minor version numbers). To allow for nightly build updates this should probably include another component (e.g. build timestamp), but we're not there yet.
This commit is contained in:
parent
cc0b931431
commit
69d9afd75a
|
@ -3435,7 +3435,7 @@
|
|||
IBC_NOTICES = NO;
|
||||
IBC_WARNINGS = YES;
|
||||
INFOPLIST_FILE = "$(SRCROOT)/macosx/Info.plist";
|
||||
INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-CC";
|
||||
INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
|
||||
INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/libtransmission/version.h";
|
||||
INFOPLIST_PREPROCESS = YES;
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
|
@ -3571,7 +3571,7 @@
|
|||
IBC_NOTICES = NO;
|
||||
IBC_WARNINGS = YES;
|
||||
INFOPLIST_FILE = "$(SRCROOT)/macosx/Info.plist";
|
||||
INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-CC";
|
||||
INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
|
||||
INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/libtransmission/version.h";
|
||||
INFOPLIST_PREPROCESS = YES;
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
|
@ -3648,7 +3648,7 @@
|
|||
IBC_NOTICES = NO;
|
||||
IBC_WARNINGS = YES;
|
||||
INFOPLIST_FILE = "$(SRCROOT)/macosx/Info.plist";
|
||||
INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-CC";
|
||||
INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
|
||||
INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/libtransmission/version.h";
|
||||
INFOPLIST_PREPROCESS = YES;
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
#define SHORT_VERSION_STRING "${TR_USER_AGENT_PREFIX}"
|
||||
#define LONG_VERSION_STRING "${TR_USER_AGENT_PREFIX} (${TR_VCS_REVISION})"
|
||||
#define VERSION_STRING_INFOPLIST ${TR_USER_AGENT_PREFIX}
|
||||
#define BUILD_STRING_INFOPLIST 14714.${TR_VERSION_MAJOR}.${TR_VERSION_MINOR}
|
||||
#define MAJOR_VERSION ${TR_VERSION_MAJOR}
|
||||
#define MINOR_VERSION ${TR_VERSION_MINOR}
|
||||
|
||||
|
|
|
@ -24,6 +24,8 @@
|
|||
|
||||
#import "AboutWindowController.h"
|
||||
|
||||
#include "version.h"
|
||||
|
||||
@implementation AboutWindowController
|
||||
|
||||
AboutWindowController * fAboutBoxInstance = nil;
|
||||
|
@ -36,9 +38,7 @@ AboutWindowController * fAboutBoxInstance = nil;
|
|||
|
||||
- (void) awakeFromNib
|
||||
{
|
||||
NSDictionary * info = [[NSBundle mainBundle] infoDictionary];
|
||||
[fVersionField setStringValue: [NSString stringWithFormat: @"%@ (%@)",
|
||||
[info objectForKey: @"CFBundleShortVersionString"], [info objectForKey: (NSString *)kCFBundleVersionKey]]];
|
||||
[fVersionField setStringValue: @(LONG_VERSION_STRING)];
|
||||
|
||||
[fCopyrightField setStringValue: [[NSBundle mainBundle] localizedStringForKey: @"NSHumanReadableCopyright"
|
||||
value: nil table: @"InfoPlist"]];
|
||||
|
|
|
@ -59,7 +59,7 @@
|
|||
</dict>
|
||||
</array>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>VCS_REVISION_NUM</string>
|
||||
<string>BUILD_STRING_INFOPLIST</string>
|
||||
<key>LSApplicationCategoryType</key>
|
||||
<string>public.app-category.utilities</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
|
|
|
@ -54,6 +54,7 @@ cat > libtransmission/version.h.new << EOF
|
|||
#define SHORT_VERSION_STRING "${user_agent_prefix}"
|
||||
#define LONG_VERSION_STRING "${user_agent_prefix} (${vcs_revision})"
|
||||
#define VERSION_STRING_INFOPLIST ${user_agent_prefix}
|
||||
#define BUILD_STRING_INFOPLIST 14714.${major_version}.${minor_version}
|
||||
#define MAJOR_VERSION ${major_version}
|
||||
#define MINOR_VERSION ${minor_version}
|
||||
EOF
|
||||
|
|
Loading…
Reference in New Issue