Skip to content

Commit fdf5c7c

Browse files
nicob4winckler
authored andcommitted
Sparkle support for automatic updates
With this commit the versioning scheme of MacVim has also changed; CFBundleVersion is now a number (indicating the build), and CFBundleShortVersionString contains the version number (e.g. 7.1).
1 parent 90acffb commit fdf5c7c

37 files changed

Lines changed: 762 additions & 43 deletions

src/MacVim/English.lproj/MainMenu.nib/classes.nib

Lines changed: 62 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/MacVim/English.lproj/MainMenu.nib/info.nib

Lines changed: 10 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
1.68 KB
Binary file not shown.

src/MacVim/Info.plist

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,10 +538,12 @@
538538
<string>${PRODUCT_NAME}</string>
539539
<key>CFBundlePackageType</key>
540540
<string>APPL</string>
541+
<key>CFBundleShortVersionString</key>
542+
<string>7.1</string>
541543
<key>CFBundleSignature</key>
542544
<string>VIMM</string>
543545
<key>CFBundleVersion</key>
544-
<string>(first snapshot)</string>
546+
<string>20</string>
545547
<key>NSMainNibFile</key>
546548
<string>MainMenu</string>
547549
<key>NSPrincipalClass</key>
@@ -598,5 +600,9 @@
598600
<string>Window</string>
599601
</dict>
600602
</array>
603+
<key>New item</key>
604+
<string></string>
605+
<key>SUFeedURL</key>
606+
<string>http://bjorn.winckler.googlepages.com/macvim_latest.xml</string>
601607
</dict>
602608
</plist>

src/MacVim/MacVim.xcodeproj/project.pbxproj

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
031AD5D40D4DE1F60026C5D7 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 031AD5D30D4DE1F60026C5D7 /* Sparkle.framework */; };
11+
031AD5EE0D4DE2490026C5D7 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 031AD5D30D4DE1F60026C5D7 /* Sparkle.framework */; };
1012
1D09AB420C6A4D520045497E /* MMTypesetter.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D09AB400C6A4D520045497E /* MMTypesetter.m */; };
1113
1D0E051C0BA5F83800B6049E /* Colors.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1D0E051B0BA5F83800B6049E /* Colors.plist */; };
1214
1D1474980C56703C0038FA2B /* MacVim.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D1474960C56703C0038FA2B /* MacVim.m */; };
@@ -97,6 +99,16 @@
9799
/* End PBXContainerItemProxy section */
98100

99101
/* Begin PBXCopyFilesBuildPhase section */
102+
031AD5ED0D4DE2360026C5D7 /* CopyFiles */ = {
103+
isa = PBXCopyFilesBuildPhase;
104+
buildActionMask = 2147483647;
105+
dstPath = "";
106+
dstSubfolderSpec = 10;
107+
files = (
108+
031AD5EE0D4DE2490026C5D7 /* Sparkle.framework in CopyFiles */,
109+
);
110+
runOnlyForDeploymentPostprocessing = 0;
111+
};
100112
1D0DCAD80BA3604D00B6CCFA /* CopyFiles */ = {
101113
isa = PBXCopyFilesBuildPhase;
102114
buildActionMask = 2147483647;
@@ -135,6 +147,7 @@
135147
/* End PBXCopyFilesBuildPhase section */
136148

137149
/* Begin PBXFileReference section */
150+
031AD5D30D4DE1F60026C5D7 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; };
138151
089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
139152
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
140153
13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
@@ -230,6 +243,7 @@
230243
1DFE25A50C527BC4003000F7 /* PSMTabBarControl.framework in Frameworks */,
231244
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
232245
1D80FBE40CBBD6F200102A1C /* Carbon.framework in Frameworks */,
246+
031AD5D40D4DE1F60026C5D7 /* Sparkle.framework in Frameworks */,
233247
);
234248
runOnlyForDeploymentPostprocessing = 0;
235249
};
@@ -274,6 +288,7 @@
274288
1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
275289
isa = PBXGroup;
276290
children = (
291+
031AD5D30D4DE1F60026C5D7 /* Sparkle.framework */,
277292
1D80FBE30CBBD6F200102A1C /* Carbon.framework */,
278293
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
279294
);
@@ -429,6 +444,7 @@
429444
1D0DCAD80BA3604D00B6CCFA /* CopyFiles */,
430445
1D9EB2840C366D7B0074B739 /* CopyFiles */,
431446
1DE608B80C58807F0055263D /* CopyFiles */,
447+
031AD5ED0D4DE2360026C5D7 /* CopyFiles */,
432448
);
433449
buildRules = (
434450
);
@@ -600,8 +616,10 @@
600616
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
601617
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_3)",
602618
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
619+
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
603620
);
604621
FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\"";
622+
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\"";
605623
GCC_DYNAMIC_NO_PIC = NO;
606624
GCC_ENABLE_FIX_AND_CONTINUE = YES;
607625
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
@@ -627,7 +645,9 @@
627645
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
628646
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_3)",
629647
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
648+
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
630649
);
650+
FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\"";
631651
FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\"";
632652
GCC_DYNAMIC_NO_PIC = YES;
633653
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Versions/Current/Headers
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Versions/Current/Resources
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Versions/Current/Sparkle
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
//
2+
// NSApplication+AppCopies.h
3+
// Sparkle
4+
//
5+
// Created by Andy Matuschak on 3/16/06.
6+
// Copyright 2006 Andy Matuschak. All rights reserved.
7+
//
8+
9+
#import <Cocoa/Cocoa.h>
10+
11+
@interface NSApplication (SUAppCopies)
12+
- (int)copiesRunning;
13+
@end
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
//
2+
// NSFileManager+Authentication.m
3+
// Sparkle
4+
//
5+
// Created by Andy Matuschak on 3/9/06.
6+
// Copyright 2006 Andy Matuschak. All rights reserved.
7+
//
8+
9+
@interface NSFileManager (SUAuthenticationAdditions)
10+
- (BOOL)movePathWithAuthentication:(NSString *)src toPath:(NSString *)dst;
11+
@end

0 commit comments

Comments
 (0)