-
-
Notifications
You must be signed in to change notification settings - Fork 14.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
macvim: 7.4.909 -> 8.1.1517 #62934
Merged
Merged
macvim: 7.4.909 -> 8.1.1517 #62934
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| diff --git a/src/MacVim/English.lproj/MainMenu.nib/designable.nib b/src/MacVim/English.lproj/MainMenu.nib/designable.nib | ||
| index bdbcfdb9e..5efc78ab6 100644 | ||
| --- a/src/MacVim/English.lproj/MainMenu.nib/designable.nib | ||
| +++ b/src/MacVim/English.lproj/MainMenu.nib/designable.nib | ||
| @@ -24,11 +24,6 @@ | ||
| <action selector="orderFrontStandardAboutPanel:" target="-2" id="142"/> | ||
| </connections> | ||
| </menuItem> | ||
| - <menuItem title="Check for Updates…" id="255"> | ||
| - <connections> | ||
| - <action selector="checkForUpdates:" target="Jqk-qh-n0J" id="Wau-rL-cbn"/> | ||
| - </connections> | ||
| - </menuItem> | ||
| <menuItem isSeparatorItem="YES" id="196"> | ||
| <modifierMask key="keyEquivalentModifierMask" command="YES"/> | ||
| </menuItem> | ||
| @@ -206,6 +201,5 @@ | ||
| </menuItem> | ||
| </items> | ||
| </menu> | ||
| - <customObject id="Jqk-qh-n0J" customClass="SUUpdater"/> | ||
| </objects> | ||
| </document> | ||
| diff --git a/src/MacVim/English.lproj/Preferences.nib/designable.nib b/src/MacVim/English.lproj/Preferences.nib/designable.nib | ||
| index 889450913..38afc3416 100644 | ||
| --- a/src/MacVim/English.lproj/Preferences.nib/designable.nib | ||
| +++ b/src/MacVim/English.lproj/Preferences.nib/designable.nib | ||
| @@ -88,14 +88,10 @@ | ||
| <rect key="frame" x="207" y="208" width="258" height="18"/> | ||
| <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> | ||
| <string key="toolTip">Checks for updates and presents a dialog box showing the release notes and prompt for whether you want to install the new version.</string> | ||
| - <buttonCell key="cell" type="check" title="Check for updates" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="975"> | ||
| + <buttonCell key="cell" type="check" title="Check for updates" bezelStyle="regularSquare" imagePosition="left" alignment="left" enabled="NO" inset="2" id="975"> | ||
| <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> | ||
| <font key="font" metaFont="system"/> | ||
| </buttonCell> | ||
| - <connections> | ||
| - <action selector="checkForUpdatesChanged:" target="-2" id="YjS-ig-M1j"/> | ||
| - <binding destination="58" name="value" keyPath="values.SUCheckAtStartup" id="169"/> | ||
| - </connections> | ||
| </button> | ||
| <textField verticalHuggingPriority="750" id="121"> | ||
| <rect key="frame" x="209" y="50" width="243" height="58"/> | ||
| @@ -186,16 +182,13 @@ | ||
| <rect key="frame" x="221" y="188" width="244" height="18"/> | ||
| <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> | ||
| <string key="toolTip">MacVim will automatically download and install updates without prompting. The updated version will be used the next time MacVim starts.</string> | ||
| - <buttonCell key="cell" type="check" title="Automatically install updates" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="GfP-vg-mec"> | ||
| + <buttonCell key="cell" type="check" title="Automatically install updates" bezelStyle="regularSquare" imagePosition="left" alignment="left" enabled="NO" inset="2" id="GfP-vg-mec"> | ||
| <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> | ||
| <font key="font" metaFont="system"/> | ||
| <connections> | ||
| <binding destination="58" name="enabled" keyPath="values.SUCheckAtStartup" id="5oY-Gf-XJN"/> | ||
| </connections> | ||
| </buttonCell> | ||
| - <connections> | ||
| - <binding destination="58" name="value" keyPath="values.SUAutomaticallyUpdate" id="kyZ-ah-zKf"/> | ||
| - </connections> | ||
| </button> | ||
| </subviews> | ||
| <point key="canvasLocation" x="137.5" y="382"/> | ||
| diff --git a/src/MacVim/MacVim.xcodeproj/project.pbxproj b/src/MacVim/MacVim.xcodeproj/project.pbxproj | ||
| index 648c4290d..c7dd99d1e 100644 | ||
| --- a/src/MacVim/MacVim.xcodeproj/project.pbxproj | ||
| +++ b/src/MacVim/MacVim.xcodeproj/project.pbxproj | ||
| @@ -66,8 +66,6 @@ | ||
| 1DFE25A50C527BC4003000F7 /* PSMTabBarControl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D493DB90C52533B00AB718C /* PSMTabBarControl.framework */; }; | ||
| 52818B031C1C08CE00F59085 /* QLStephen.qlgenerator in Copy QuickLookPlugin */ = {isa = PBXBuildFile; fileRef = 52818AFF1C1C075300F59085 /* QLStephen.qlgenerator */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; | ||
| 528DA66A1426D4F9003380F1 /* macvim-askpass in Copy Scripts */ = {isa = PBXBuildFile; fileRef = 528DA6691426D4EB003380F1 /* macvim-askpass */; }; | ||
| - 52A364731C4A5789005757EC /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52A364721C4A5789005757EC /* Sparkle.framework */; }; | ||
| - 52A364761C4A57C1005757EC /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 52A364721C4A5789005757EC /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; | ||
| 52B7ED9B1C4A4D6900AFFF15 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 52B7ED9A1C4A4D6900AFFF15 /* dsa_pub.pem */; }; | ||
| 8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; }; | ||
| 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; | ||
| @@ -124,7 +122,6 @@ | ||
| dstPath = ""; | ||
| dstSubfolderSpec = 10; | ||
| files = ( | ||
| - 52A364761C4A57C1005757EC /* Sparkle.framework in Copy Frameworks */, | ||
| 1D493DBA0C52534300AB718C /* PSMTabBarControl.framework in Copy Frameworks */, | ||
| ); | ||
| name = "Copy Frameworks"; | ||
| @@ -250,7 +247,6 @@ | ||
| 32CA4F630368D1EE00C91783 /* MacVim_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MacVim_Prefix.pch; sourceTree = "<group>"; }; | ||
| 52818AFA1C1C075300F59085 /* QuickLookStephen.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = QuickLookStephen.xcodeproj; path = qlstephen/QuickLookStephen.xcodeproj; sourceTree = "<group>"; }; | ||
| 528DA6691426D4EB003380F1 /* macvim-askpass */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "macvim-askpass"; sourceTree = "<group>"; }; | ||
| - 52A364721C4A5789005757EC /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; }; | ||
| 52B7ED9A1C4A4D6900AFFF15 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dsa_pub.pem; sourceTree = "<group>"; }; | ||
| 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; | ||
| 8D1107320486CEB800E47090 /* MacVim.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MacVim.app; sourceTree = BUILT_PRODUCTS_DIR; }; | ||
| @@ -264,7 +260,6 @@ | ||
| 1DFE25A50C527BC4003000F7 /* PSMTabBarControl.framework in Frameworks */, | ||
| 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */, | ||
| 1D8B5A53104AF9FF002E59D5 /* Carbon.framework in Frameworks */, | ||
| - 52A364731C4A5789005757EC /* Sparkle.framework in Frameworks */, | ||
| ); | ||
| runOnlyForDeploymentPostprocessing = 0; | ||
| }; | ||
| @@ -443,7 +438,6 @@ | ||
| 29B97323FDCFA39411CA2CEA /* Frameworks */ = { | ||
| isa = PBXGroup; | ||
| children = ( | ||
| - 52A364721C4A5789005757EC /* Sparkle.framework */, | ||
| 1D8B5A52104AF9FF002E59D5 /* Carbon.framework */, | ||
| 1D493DB30C52533B00AB718C /* PSMTabBarControl.xcodeproj */, | ||
| 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This could cause issues when /usr/bin/ibtool doesn't exist. Probably we should follow the Hydra builds to see. I think a
darwin.ibtoolmight be useful to give a nice error message when this doesn't exist.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What version of macOS does Hydra run on, and what's the minimum version of macOS that Nix supports?
/usr/bin/ibtoolshould exist on any version of macOS from the past few years at least. I suppose this could be/usr/bin/xcrun ibtoolinstead if we need to support a version of macOS that predates the introduction of the full set of build tools into/usr/bin.