Skip to content

Commit e44d8aa

Browse files
splhacksplhack
committed
Merge pull request #141 from macvim-dev/fix/xcodeproj_warnings
Add MacVim_legacy.xcodeproj to get rid of warnings from the current one
2 parents 8bd1586 + bc134ed commit e44d8aa

9 files changed

Lines changed: 765 additions & 23 deletions

File tree

‎src/MacVim/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1231,7 +1231,7 @@
12311231
<key>CFBundleIconFile</key>
12321232
<string>MacVim</string>
12331233
<key>CFBundleIdentifier</key>
1234-
<string>org.vim.MacVim</string>
1234+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
12351235
<key>CFBundleInfoDictionaryVersion</key>
12361236
<string>6.0</string>
12371237
<key>CFBundleName</key>

‎src/MacVim/MacVim.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 42;
6+
objectVersion = 46;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -21,8 +21,8 @@
2121
1D22374B0E45DF4800E6FFFF /* Advanced.png in Resources */ = {isa = PBXBuildFile; fileRef = 1D22374A0E45DF4800E6FFFF /* Advanced.png */; };
2222
1D384A0E100D671700D3C22F /* KeyBinding.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1D384A0D100D671700D3C22F /* KeyBinding.plist */; };
2323
1D44972211FCA9B400B0630F /* MMCoreTextView+ToolTip.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D44972111FCA9B400B0630F /* MMCoreTextView+ToolTip.m */; };
24-
1D493D580C5247BF00AB718C /* Vim in Copy Executables */ = {isa = PBXBuildFile; fileRef = 1D493D570C5247BF00AB718C /* Vim */; };
25-
1D493DBA0C52534300AB718C /* PSMTabBarControl.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 1D493DB90C52533B00AB718C /* PSMTabBarControl.framework */; };
24+
1D493D580C5247BF00AB718C /* Vim in Copy Executables */ = {isa = PBXBuildFile; fileRef = 1D493D570C5247BF00AB718C /* Vim */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
25+
1D493DBA0C52534300AB718C /* PSMTabBarControl.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 1D493DB90C52533B00AB718C /* PSMTabBarControl.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
2626
1D60088B0E96A0B2003763F0 /* MMFindReplaceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D60088A0E96A0B2003763F0 /* MMFindReplaceController.m */; };
2727
1D80591F0E1185EA001699D1 /* Miscellaneous.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D80591D0E1185EA001699D1 /* Miscellaneous.m */; };
2828
1D80FBD40CBBD3B700102A1C /* MMFullScreenWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D80FBD00CBBD3B700102A1C /* MMFullScreenWindow.m */; };
@@ -437,8 +437,11 @@
437437
/* Begin PBXProject section */
438438
29B97313FDCFA39411CA2CEA /* Project object */ = {
439439
isa = PBXProject;
440+
attributes = {
441+
LastUpgradeCheck = 0710;
442+
};
440443
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MacVim" */;
441-
compatibilityVersion = "Xcode 2.4";
444+
compatibilityVersion = "Xcode 3.2";
442445
developmentRegion = English;
443446
hasScannedForEncodings = 1;
444447
knownRegions = (
@@ -612,7 +615,7 @@
612615
C01FCF4B08A954540054247B /* Debug */ = {
613616
isa = XCBuildConfiguration;
614617
buildSettings = {
615-
ARCHS = "$(NATIVE_ARCH_ACTUAL)";
618+
COMBINE_HIDPI_IMAGES = YES;
616619
COPY_PHASE_STRIP = NO;
617620
CURRENT_PROJECT_VERSION = 78;
618621
FRAMEWORK_SEARCH_PATHS = (
@@ -632,6 +635,7 @@
632635
INSTALL_PATH = "$(HOME)/Applications";
633636
MACOSX_DEPLOYMENT_TARGET = "";
634637
ONLY_ACTIVE_ARCH = YES;
638+
PRODUCT_BUNDLE_IDENTIFIER = org.vim.MacVim;
635639
PRODUCT_NAME = MacVim;
636640
VERSIONING_SYSTEM = "apple-generic";
637641
WARNING_CFLAGS = "-Wall";
@@ -643,7 +647,7 @@
643647
C01FCF4C08A954540054247B /* Release */ = {
644648
isa = XCBuildConfiguration;
645649
buildSettings = {
646-
ARCHS = "$(NATIVE_ARCH_ACTUAL)";
650+
COMBINE_HIDPI_IMAGES = YES;
647651
COPY_PHASE_STRIP = YES;
648652
CURRENT_PROJECT_VERSION = 78;
649653
FRAMEWORK_SEARCH_PATHS = (
@@ -662,6 +666,7 @@
662666
INSTALL_PATH = "$(HOME)/Applications";
663667
MACOSX_DEPLOYMENT_TARGET = "";
664668
ONLY_ACTIVE_ARCH = YES;
669+
PRODUCT_BUNDLE_IDENTIFIER = org.vim.MacVim;
665670
PRODUCT_NAME = MacVim;
666671
VERSIONING_SYSTEM = "apple-generic";
667672
WRAPPER_EXTENSION = app;
@@ -672,7 +677,7 @@
672677
C01FCF4F08A954540054247B /* Debug */ = {
673678
isa = XCBuildConfiguration;
674679
buildSettings = {
675-
ARCHS = "$(NATIVE_ARCH_ACTUAL)";
680+
ENABLE_TESTABILITY = YES;
676681
GCC_VERSION = 4.2;
677682
GCC_WARN_ABOUT_RETURN_TYPE = YES;
678683
GCC_WARN_UNUSED_VARIABLE = YES;
@@ -685,7 +690,6 @@
685690
C01FCF5008A954540054247B /* Release */ = {
686691
isa = XCBuildConfiguration;
687692
buildSettings = {
688-
ARCHS = "$(NATIVE_ARCH_ACTUAL)";
689693
GCC_VERSION = 4.2;
690694
GCC_WARN_ABOUT_RETURN_TYPE = YES;
691695
GCC_WARN_UNUSED_VARIABLE = YES;

‎src/MacVim/MacVim_legacy.xcodeproj/project.pbxproj‎

Lines changed: 722 additions & 0 deletions
Large diffs are not rendered by default.

‎src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 42;
6+
objectVersion = 46;
77
objects = {
88

99
/* Begin PBXAggregateTarget section */
@@ -432,8 +432,11 @@
432432
/* Begin PBXProject section */
433433
0259C573FE90428111CA0C5A /* Project object */ = {
434434
isa = PBXProject;
435+
attributes = {
436+
LastUpgradeCheck = 0710;
437+
};
435438
buildConfigurationList = C056398B08A954F8003078D8 /* Build configuration list for PBXProject "PSMTabBarControl" */;
436-
compatibilityVersion = "Xcode 2.4";
439+
compatibilityVersion = "Xcode 3.2";
437440
developmentRegion = English;
438441
hasScannedForEncodings = 1;
439442
knownRegions = (
@@ -564,7 +567,7 @@
564567
C056398008A954F8003078D8 /* Debug */ = {
565568
isa = XCBuildConfiguration;
566569
buildSettings = {
567-
ARCHS = "$(NATIVE_ARCH_ACTUAL)";
570+
COMBINE_HIDPI_IMAGES = YES;
568571
COPY_PHASE_STRIP = NO;
569572
DYLIB_COMPATIBILITY_VERSION = 1;
570573
DYLIB_CURRENT_VERSION = 1;
@@ -580,6 +583,7 @@
580583
INSTALL_PATH = "@executable_path/../Frameworks";
581584
ONLY_ACTIVE_ARCH = YES;
582585
OTHER_LDFLAGS = "";
586+
PRODUCT_BUNDLE_IDENTIFIER = com.positivespinmedia.PSMTabBarControlFramework;
583587
PRODUCT_NAME = PSMTabBarControl;
584588
SYMROOT = ../build;
585589
ZERO_LINK = NO;
@@ -589,7 +593,7 @@
589593
C056398108A954F8003078D8 /* Release */ = {
590594
isa = XCBuildConfiguration;
591595
buildSettings = {
592-
ARCHS = "$(NATIVE_ARCH_ACTUAL)";
596+
COMBINE_HIDPI_IMAGES = YES;
593597
DYLIB_COMPATIBILITY_VERSION = 1;
594598
DYLIB_CURRENT_VERSION = 1;
595599
FRAMEWORK_VERSION = A;
@@ -602,6 +606,7 @@
602606
INSTALL_PATH = "@executable_path/../Frameworks";
603607
ONLY_ACTIVE_ARCH = YES;
604608
OTHER_LDFLAGS = "";
609+
PRODUCT_BUNDLE_IDENTIFIER = com.positivespinmedia.PSMTabBarControlFramework;
605610
PRODUCT_NAME = PSMTabBarControl;
606611
SYMROOT = ../build;
607612
};
@@ -628,10 +633,6 @@
628633
C056398908A954F8003078D8 /* Release */ = {
629634
isa = XCBuildConfiguration;
630635
buildSettings = {
631-
ARCHS = (
632-
ppc,
633-
i386,
634-
);
635636
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
636637
GCC_MODEL_TUNING = G5;
637638
PRODUCT_NAME = All;
@@ -646,7 +647,7 @@
646647
C056398C08A954F8003078D8 /* Debug */ = {
647648
isa = XCBuildConfiguration;
648649
buildSettings = {
649-
ARCHS = "$(NATIVE_ARCH_ACTUAL)";
650+
ENABLE_TESTABILITY = YES;
650651
GCC_WARN_ABOUT_RETURN_TYPE = YES;
651652
GCC_WARN_UNUSED_VARIABLE = YES;
652653
ONLY_ACTIVE_ARCH = YES;
@@ -658,7 +659,6 @@
658659
C056398D08A954F8003078D8 /* Release */ = {
659660
isa = XCBuildConfiguration;
660661
buildSettings = {
661-
ARCHS = "$(NATIVE_ARCH_ACTUAL)";
662662
GCC_WARN_ABOUT_RETURN_TYPE = YES;
663663
GCC_WARN_UNUSED_VARIABLE = YES;
664664
ONLY_ACTIVE_ARCH = YES;

‎src/MacVim/PSMTabBarControl/PSMTabBarControlFramework-Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
55
<key>CFBundleDevelopmentRegion</key>
66
<string>English</string>
77
<key>CFBundleExecutable</key>
88
<string>PSMTabBarControl</string>
99
<key>CFBundleIdentifier</key>
10-
<string>com.positivespinmedia.PSMTabBarControlFramework</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundlePackageType</key>

‎src/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2934,7 +2934,7 @@ RELEASEDIR = MacVim/build/Release
29342934
DMGDIR = MacVim/build/dmg
29352935

29362936
macvim: $(VIMTARGET)
2937-
xcodebuild -project MacVim/MacVim.xcodeproj $(XCODEFLAGS)
2937+
xcodebuild -project MacVim/$(XCODEPROJ) $(XCODEFLAGS)
29382938

29392939
macvim-dmg: macvim
29402940
mkdir -p $(DMGDIR)
@@ -2954,7 +2954,7 @@ macvim-dmg: macvim
29542954

29552955
macvimclean:
29562956
if test -d MacVim; then \
2957-
xcodebuild -project MacVim/MacVim.xcodeproj clean; \
2957+
xcodebuild -project MacVim/$(XCODEPROJ) clean; \
29582958
fi
29592959

29602960

‎src/auto/configure‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -623,6 +623,7 @@ ac_subst_vars='LTLIBOBJS
623623
LIBOBJS
624624
LINK_AS_NEEDED
625625
DEPEND_CFLAGS_FILTER
626+
XCODEPROJ
626627
XCODEFLAGS
627628
MAKEMO
628629
MSGFMT
@@ -13470,6 +13471,13 @@ fi
1347013471

1347113472

1347213473

13474+
13475+
macosx_version=`/usr/bin/sw_vers -productVersion|/usr/bin/sed -e 's/^\([0-9]*\.[0-9]*\).*/\1/'`
13476+
case "$macosx_version" in
13477+
10.4|10.5) XCODEPROJ="MacVim_legacy.xcodeproj";;
13478+
*) XCODEPROJ="MacVim.xcodeproj";;
13479+
esac
13480+
1347313481
fi
1347413482

1347513483

‎src/config.mk.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ CC = @CC@
2121
DEFS = @DEFS@
2222
CFLAGS = @CFLAGS@
2323
CPPFLAGS = @CPPFLAGS@
24+
XCODEPROJ = @XCODEPROJ@
2425
XCODEFLAGS = @XCODEFLAGS@
2526
srcdir = @srcdir@
2627
VPATH = @srcdir@

‎src/configure.in‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4079,6 +4079,13 @@ if test "x$MACOSX" = "xyes"; then
40794079
[ AC_MSG_RESULT(using default) ])
40804080

40814081
AC_SUBST(XCODEFLAGS)
4082+
4083+
macosx_version=`/usr/bin/sw_vers -productVersion|/usr/bin/sed -e 's/^\([[0-9]]*\.[[0-9]]*\).*/\1/'`
4084+
case "$macosx_version" in
4085+
10.4|10.5) XCODEPROJ="MacVim_legacy.xcodeproj";;
4086+
*) XCODEPROJ="MacVim.xcodeproj";;
4087+
esac
4088+
AC_SUBST(XCODEPROJ)
40824089
fi
40834090

40844091

0 commit comments

Comments
 (0)