Skip to content

Commit b0ba0b9

Browse files
authored
Merge pull request #1452 from ychin/use-new-xcodeproj-format
Update xcodeproj version, generate a compatible one for Xcode 8+
2 parents bb85aff + ecea5ea commit b0ba0b9

File tree

6 files changed

+1417
-8
lines changed

6 files changed

+1417
-8
lines changed

.github/workflows/ci-macvim.yaml

+11-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
# Oldest version of Xcode supported on GitHub Action to test source code backwards compatibility
5757
- os: macos-11
5858
xcode: '11.7'
59-
extra: [vimtags]
59+
extra: [vimtags, check-xcodeproj-compat]
6060

6161
# Older version of Xcode, and used to publish legacy builds (for macOS 10.9 - 10.12)
6262
- os: macos-12
@@ -300,6 +300,16 @@ jobs:
300300
make -C runtime/doc vimtags VIMEXE=../../${VIM_BIN}
301301
git diff --exit-code -- runtime/doc/tags
302302
303+
- name: Check Xcode project compatibility version
304+
if: contains(matrix.extra, 'check-xcodeproj-compat')
305+
run: |
306+
# Confirm that the compatibility version of xcodeproj is correct and not outdated.
307+
rm -rf src/MacVim/MacVim_xcode8.xcodeproj
308+
make -C src macvim-xcodeproj-compat
309+
if ! git diff --exit-code -- src/MacVim/MacVim_xcode8.xcodeproj; then
310+
echo 'MacVim_xcode8.xcodeproj is outdated. Run "make -C src macvim-xcodeproj-compat" to re-generate it.'; false
311+
fi
312+
303313
- name: Build test binaries
304314
run: |
305315
# Build the unit test binaries first. With link-time-optimization they take some time to link. Running them

.gitignore

+5-5
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,11 @@ src/kword_test
9797
# From MacVim
9898
.*.swp
9999
.DS_Store
100-
src/MacVim/MacVim.xcodeproj/*.mode1
101-
src/MacVim/MacVim.xcodeproj/*.mode1v3
102-
src/MacVim/MacVim.xcodeproj/*.pbxuser
103-
src/MacVim/MacVim.xcodeproj/project.xcworkspace
104-
src/MacVim/MacVim.xcodeproj/xcuserdata
100+
src/MacVim/MacVim*.xcodeproj/*.mode1
101+
src/MacVim/MacVim*.xcodeproj/*.mode1v3
102+
src/MacVim/MacVim*.xcodeproj/*.pbxuser
103+
src/MacVim/MacVim*.xcodeproj/project.xcworkspace
104+
src/MacVim/MacVim*.xcodeproj/xcuserdata
105105
src/MacVim/icons/*.pyc
106106
src/MacVim/icons/*.ttf
107107
src/MacVim/icons/*.reg

src/MacVim/MacVim.xcodeproj/project.pbxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 47;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */

0 commit comments

Comments
 (0)