Skip to content

Commit cd80006

Browse files
committed
patch 8.2.1546: build rule for Vim.app is unused
Problem: Build rule for Vim.app is unused. Solution: Delete the related build rules.
1 parent 76603ba commit cd80006

2 files changed

Lines changed: 7 additions & 78 deletions

File tree

src/Makefile

Lines changed: 5 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -3557,8 +3557,9 @@ objects/netbeans.o: netbeans.c
35573557
objects/channel.o: channel.c
35583558
$(CCC) -o $@ channel.c
35593559

3560-
Makefile:
3561-
@echo The name of the makefile MUST be "Makefile" (with capital M)!!!!
3560+
# Dependencies that "make depend" doesn't find
3561+
objects/gui_gtk_x11.o: version.h
3562+
35623563

35633564
# Build rules for libvterm. Putting them here allows for adding compilation
35643565
# options specific for Vim. Since the .o files go into objects/ we do need to
@@ -3617,83 +3618,9 @@ objects/xpatience.o: xdiff/xpatience.c $(XDIFF_INCL)
36173618
$(CCCDIFF) -o $@ xdiff/xpatience.c
36183619

36193620

3620-
###############################################################################
3621-
### MacOS X installation
3622-
###
3623-
### This installs a runnable Vim.app in $(prefix)
3624-
3625-
REZ = /Developer/Tools/Rez
3626-
RESDIR = $(APPDIR)/Contents/Resources
3627-
VERSION = $(VIMMAJOR).$(VIMMINOR)
3628-
3629-
### Common flags
3630-
M4FLAGSX = $(M4FLAGS) -DAPP_EXE=$(VIMNAME) -DAPP_NAME=$(VIMNAME) \
3631-
-DAPP_VER=$(VERSION)
3632-
3633-
install_macosx: gui_bundle
3634-
# Remove the link to the runtime dir, don't want to copy all of that.
3635-
-rm $(RESDIR)/vim/runtime
3636-
$(INSTALL_DATA_R) $(APPDIR) $(DESTDIR)$(prefix)
3637-
# Generate the help tags file now, it won't work with "make installruntime".
3638-
-@srcdir=`pwd`; cd $(HELPSOURCE); $(MAKE) VIMEXE=$$srcdir/$(VIMTARGET) vimtags
3639-
# Install the runtime files. Recursive!
3640-
$(MKDIR_P) $(DESTDIR)$(prefix)/$(RESDIR)/vim/runtime
3641-
srcdir=`pwd`; $(MAKE) -f Makefile installruntime \
3642-
VIMEXE=$$srcdir/$(VIMTARGET) \
3643-
prefix=$(DESTDIR)$(prefix)/$(RESDIR)$(VIMDIR) \
3644-
exec_prefix=$(DESTDIR)$(prefix)/$(APPDIR)/Contents \
3645-
BINDIR=$(DESTDIR)$(prefix)/$(APPDIR)/Contents/MacOS \
3646-
VIMLOC=$(DESTDIR)$(prefix)/$(RESDIR)$(VIMDIR) \
3647-
VIMRTLOC=$(DESTDIR)$(prefix)/$(RESDIR)$(VIMDIR)/runtime
3648-
# Put the link back.
3649-
ln -s `pwd`/../runtime $(RESDIR)/vim
3650-
# Copy rgb.txt, Mac doesn't always have X11
3651-
$(INSTALL_DATA) $(SCRIPTSOURCE)/rgb.txt $(DESTDIR)$(prefix)/$(RESDIR)/vim/runtime
3652-
# TODO: Create the vimtutor and/or gvimtutor application.
3653-
3654-
gui_bundle: $(RESDIR) bundle-dir bundle-executable bundle-info bundle-resource \
3655-
bundle-language
3656-
3657-
$(RESDIR):
3658-
$(MKDIR_P) $@
3659-
3660-
bundle-dir: $(APPDIR)/Contents $(VIMTARGET)
3661-
# Make a link to the runtime directory, so that we can try out the executable
3662-
# without installing it.
3663-
$(MKDIR_P) $(RESDIR)/vim
3664-
-ln -s `pwd`/../runtime $(RESDIR)/vim
3665-
3666-
bundle-executable: $(VIMTARGET)
3667-
$(MKDIR_P) $(APPDIR)/Contents/MacOS
3668-
cp $(VIMTARGET) $(APPDIR)/Contents/MacOS/$(VIMTARGET)
3669-
3670-
bundle-info: bundle-dir
3671-
@echo "Creating PkgInfo"
3672-
@echo -n "APPLVIM!" > $(APPDIR)/Contents/PkgInfo
3673-
@echo "Creating Info.plist"
3674-
m4 $(M4FLAGSX) infplist.xml > $(APPDIR)/Contents/Info.plist
3675-
3676-
bundle-resource: bundle-dir bundle-rsrc
3677-
cp -f $(RSRC_DIR)/*.icns $(RESDIR)
3678-
3679-
### Classic resources
3680-
# Resource fork (in the form of a .rsrc file) for Classic Vim (Mac OS 9)
3681-
# This file is also required for OS X Vim.
3682-
bundle-rsrc: os_mac.rsr.hqx
3683-
@echo "Creating resource fork"
3684-
python dehqx.py $<
3685-
rm -f gui_mac.rsrc
3686-
mv gui_mac.rsrc.rsrcfork $(RESDIR)/$(VIMNAME).rsrc
3687-
3688-
bundle-language: bundle-dir
3689-
3690-
$(APPDIR)/Contents:
3691-
$(MKDIR_P) $(APPDIR)/Contents/MacOS
3692-
$(MKDIR_P) $(RESDIR)/English.lproj
3693-
3621+
Makefile:
3622+
@echo The name of the makefile MUST be "Makefile" (with capital M)!!!!
36943623

3695-
# Dependencies that "make depend" doesn't find
3696-
objects/gui_gtk_x11.o: version.h
36973624

36983625
###############################################################################
36993626
#

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -754,6 +754,8 @@ static char *(features[]) =
754754

755755
static int included_patches[] =
756756
{ /* Add new patch number below this line */
757+
/**/
758+
1546,
757759
/**/
758760
1545,
759761
/**/

0 commit comments

Comments
 (0)