Skip to content

Fix building with Xcode 11#946

Merged
ychin merged 1 commit intomacvim-dev:masterfrom
s4y:xcode-11-build
Oct 6, 2019
Merged

Fix building with Xcode 11#946
ychin merged 1 commit intomacvim-dev:masterfrom
s4y:xcode-11-build

Conversation

@s4y
Copy link
Copy Markdown
Contributor

@s4y s4y commented Oct 2, 2019

See commit message for details.

Two changes:
1. Switch PSMTabBarCell from accessing NSCell's _controlView ivar, which
   is gone, to accessing its controlView property. Also override the
   controlView property to be a PSMTabBarControl instead of an NSView.
2. Move macvim-askpass from MacOS to Resources to not confuse codesign.

Fixes macvim-dev#936.
@eirnym
Copy link
Copy Markdown
Contributor

eirnym commented Oct 2, 2019

Thank you for your PR. From my side, I ask only to check where macvim-askpass will land for various Xcode versions after your changes to make sure all scripts will work correctly.

@s4y s4y closed this Oct 3, 2019
@s4y s4y reopened this Oct 3, 2019
@s4y
Copy link
Copy Markdown
Contributor Author

s4y commented Oct 3, 2019

@eirnym: Could you say more? The dstSubfolderSpec change should target the Resources folder for all Xcode versions.

Copy link
Copy Markdown
Contributor

@eirnym eirnym left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Comment thread src/MacVim/gvimrc
Comment thread src/MacVim/MacVim.xcodeproj/project.pbxproj
@eirnym
Copy link
Copy Markdown
Contributor

eirnym commented Oct 3, 2019

@s4y I don't know how exactly older Xcode versions read this setting. Some people here prefer to keep some compatibility with older systems just because they use them. I don't know how old systems are and which Xcode versions are good to test. Otherwise, I'm fine with your changes.

@s4y
Copy link
Copy Markdown
Contributor Author

s4y commented Oct 4, 2019

@eirnym Got it; sure. I just went through the Travis build logs for Xcode 7, 8, 9, and 10, which show macvim-askpass being copied to Resources, and I verified locally with Xcode 11.

Travis logs

xcode7.3

PBXCp macvim-askpass build/Release/MacVim.app/Contents/Resources/macvim-askpass
    cd /Users/travis/build/macvim-dev/macvim/src/MacVim
    builtin-copy -exclude .DS_Store -exclude CVS -exclude .svn -exclude .git -exclude .hg -strip-debug-symbols -strip-tool /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/strip -resolve-src-symlinks /Users/travis/build/macvim-dev/macvim/src/MacVim/macvim-askpass /Users/travis/build/macvim-dev/macvim/src/MacVim/build/Release/MacVim.app/Contents/Resources

xcode8.3

PBXCp macvim-askpass build/Release/MacVim.app/Contents/Resources/macvim-askpass
    cd /Users/travis/build/macvim-dev/macvim/src/MacVim
    builtin-copy -exclude .DS_Store -exclude CVS -exclude .svn -exclude .git -exclude .hg -strip-debug-symbols -strip-tool /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/strip -resolve-src-symlinks /Users/travis/build/macvim-dev/macvim/src/MacVim/macvim-askpass /Users/travis/build/macvim-dev/macvim/src/MacVim/build/Release/MacVim.app/Contents/Resources

xcode9.4

PBXCp macvim-askpass build/Release/MacVim.app/Contents/Resources/macvim-askpass
    cd /Users/travis/build/macvim-dev/macvim/src/MacVim
    builtin-copy -exclude .DS_Store -exclude CVS -exclude .svn -exclude .git -exclude .hg -strip-debug-symbols -strip-tool /Applications/Xcode-9.4.1.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/strip -resolve-src-symlinks /Users/travis/build/macvim-dev/macvim/src/MacVim/macvim-askpass /Users/travis/build/macvim-dev/macvim/src/MacVim/build/Release/MacVim.app/Contents/Resources

xcode10.2

PBXCp /Users/travis/build/macvim-dev/macvim/src/MacVim/macvim-askpass /Users/travis/build/macvim-dev/macvim/src/MacVim/build/Release/MacVim.app/Contents/Resources/macvim-askpass (in target: MacVim)
    cd /Users/travis/build/macvim-dev/macvim/src/MacVim
    builtin-copy -exclude .DS_Store -exclude CVS -exclude .svn -exclude .git -exclude .hg -strip-debug-symbols -strip-tool /Applications/Xcode-10.2.1.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/strip -resolve-src-symlinks /Users/travis/build/macvim-dev/macvim/src/MacVim/macvim-askpass /Users/travis/build/macvim-dev/macvim/src/MacVim/build/Release/MacVim.app/Contents/Resources

@eirnym
Copy link
Copy Markdown
Contributor

eirnym commented Oct 4, 2019

Thank you

@markwu
Copy link
Copy Markdown

markwu commented Oct 5, 2019

The PR works great for me.

@ychin
Copy link
Copy Markdown
Member

ychin commented Oct 6, 2019

Thanks for doing this. I double checked in older Xcode versions and the folder seemed fine.

@ychin ychin merged commit b72b455 into macvim-dev:master Oct 6, 2019
@s4y s4y deleted the xcode-11-build branch November 16, 2019 15:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants