aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-28 04:24:06 -04:00
Code Activity

patch 8.2.2883: MS-Windows manifest file name is misleading

Browse Source 
Problem:    MS-Windows manifest file name is misleading.
Solution:   Rename the file. (closes #8241)
This commit is contained in:
matveyt
2021-05-24 18:48:27 +02:00
committed by Bram Moolenaar
parent 15bbb8f4f3
commit e97c7c962c
9 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -25,7 +25,6 @@ src/auto/pathdef.c
# Windows # Windows
*.exe *.exe
*.idb *.idb
*.manifest
*.exp *.exp
*.map *.map
*.obj *.obj

1
.hgignore
View File

@@ -26,7 +26,6 @@ src/auto/pathdef.c
# Windows # Windows
*.exe *.exe
*.idb *.idb
*.manifest
*.exp *.exp
*.map *.map
*.obj *.obj

2
Filelist
View File

@@ -567,7 +567,7 @@ SRC_DOS = \
src/uninstall.c \ src/uninstall.c \
src/vim.def \ src/vim.def \
src/vim.rc \ src/vim.rc \
src/gvim.exe.mnf \ src/vim.manifest \
src/vimrun.c \ src/vimrun.c \
src/xpm_w32.c \ src/xpm_w32.c \
src/xpm_w32.h \ src/xpm_w32.h \

4
Makefile
View File

@@ -94,7 +94,7 @@ MINOR = 2
# src/Makefile, README.txt, README.md, src/README.md, READMEdir/README*.txt, # src/Makefile, README.txt, README.md, src/README.md, READMEdir/README*.txt,
# runtime/doc/*.txt and make nsis/gvim_version.nsh. # runtime/doc/*.txt and make nsis/gvim_version.nsh.
# For a minor/major version: src/GvimExt/GvimExt.reg, src/vim.def, # For a minor/major version: src/GvimExt/GvimExt.reg, src/vim.def,
# src/gvim.exe.mnf. # src/vim.manifest.
# - Compile Vim with GTK, Perl, Python, Python3, TCL, Ruby, Lua, Cscope and # - Compile Vim with GTK, Perl, Python, Python3, TCL, Ruby, Lua, Cscope and
# "huge" features. Add MZscheme if you can make it work. # "huge" features. Add MZscheme if you can make it work.
# Use "make reconfig" after selecting the configure arguments. # Use "make reconfig" after selecting the configure arguments.
@@ -152,7 +152,7 @@ MINOR = 2
# > cd src # > cd src
# > msvc2015.bat # > msvc2015.bat
# - Build the console binary: # - Build the console binary:
# > nmake -f Make_mvc.mak # > nmake -f Mae_mvc.mak
# - Run the tests and check the output: # - Run the tests and check the output:
# > nmake -f Make_mvc.mak testclean # > nmake -f Make_mvc.mak testclean
# > nmake -f Make_mvc.mak test # > nmake -f Make_mvc.mak test

16
src/Make_cyg_ming.mak
View File

@@ -820,11 +820,11 @@ OBJ = \
$(OUTDIR)/window.o $(OUTDIR)/window.o
ifeq ($(VIMDLL),yes) ifeq ($(VIMDLL),yes)
OBJ += $(OUTDIR)/os_w32dll.o $(OUTDIR)/vimrcd.o OBJ += $(OUTDIR)/os_w32dll.o $(OUTDIR)/vimresd.o
EXEOBJC = $(OUTDIR)/os_w32exec.o $(OUTDIR)/vimrcc.o EXEOBJC = $(OUTDIR)/os_w32exec.o $(OUTDIR)/vimresc.o
EXEOBJG = $(OUTDIR)/os_w32exeg.o $(OUTDIR)/vimrcg.o EXEOBJG = $(OUTDIR)/os_w32exeg.o $(OUTDIR)/vimresg.o
else else
OBJ += $(OUTDIR)/os_w32exe.o $(OUTDIR)/vimrc.o OBJ += $(OUTDIR)/os_w32exe.o $(OUTDIR)/vimres.o
endif endif
ifdef PERL ifdef PERL
@@ -1145,21 +1145,21 @@ $(OUTDIR)/%.o : %.c $(INCL)
$(CC) -c $(CFLAGS) $< -o $@ $(CC) -c $(CFLAGS) $< -o $@
ifeq ($(VIMDLL),yes) ifeq ($(VIMDLL),yes)
$(OUTDIR)/vimrcc.o: vim.rc gvim.exe.mnf version.h gui_w32_rc.h vim.ico $(OUTDIR)/vimresc.o: vim.rc vim.manifest version.h gui_w32_rc.h vim.ico
$(WINDRES) $(WINDRES_FLAGS) $(DEFINES) -UFEAT_GUI_MSWIN \ $(WINDRES) $(WINDRES_FLAGS) $(DEFINES) -UFEAT_GUI_MSWIN \
--input-format=rc --output-format=coff -i vim.rc -o $@ --input-format=rc --output-format=coff -i vim.rc -o $@
$(OUTDIR)/vimrcg.o: vim.rc gvim.exe.mnf version.h gui_w32_rc.h vim.ico $(OUTDIR)/vimresg.o: vim.rc vim.manifest version.h gui_w32_rc.h vim.ico
$(WINDRES) $(WINDRES_FLAGS) $(DEFINES) \ $(WINDRES) $(WINDRES_FLAGS) $(DEFINES) \
--input-format=rc --output-format=coff -i vim.rc -o $@ --input-format=rc --output-format=coff -i vim.rc -o $@
$(OUTDIR)/vimrcd.o: vim.rc version.h gui_w32_rc.h \ $(OUTDIR)/vimresd.o: vim.rc version.h gui_w32_rc.h \
tools.bmp tearoff.bmp vim.ico vim_error.ico \ tools.bmp tearoff.bmp vim.ico vim_error.ico \
vim_alert.ico vim_info.ico vim_quest.ico vim_alert.ico vim_info.ico vim_quest.ico
$(WINDRES) $(WINDRES_FLAGS) $(DEFINES) -DRCDLL -DVIMDLLBASE=\\\"$(VIMDLLBASE)\\\" \ $(WINDRES) $(WINDRES_FLAGS) $(DEFINES) -DRCDLL -DVIMDLLBASE=\\\"$(VIMDLLBASE)\\\" \
--input-format=rc --output-format=coff -i vim.rc -o $@ --input-format=rc --output-format=coff -i vim.rc -o $@
else else
$(OUTDIR)/vimrc.o: vim.rc gvim.exe.mnf version.h gui_w32_rc.h \ $(OUTDIR)/vimres.o: vim.rc vim.manifest version.h gui_w32_rc.h \
tools.bmp tearoff.bmp vim.ico vim_error.ico \ tools.bmp tearoff.bmp vim.ico vim_error.ico \
vim_alert.ico vim_info.ico vim_quest.ico vim_alert.ico vim_info.ico vim_quest.ico
$(WINDRES) $(WINDRES_FLAGS) $(DEFINES) \ $(WINDRES) $(WINDRES_FLAGS) $(DEFINES) \

6
src/Make_mvc.mak
View File

@@ -1806,11 +1806,11 @@ $(OUTDIR)/xpm_w32.obj: $(OUTDIR) xpm_w32.c
$(CC) $(CFLAGS_OUTDIR) $(XPM_INC) xpm_w32.c $(CC) $(CFLAGS_OUTDIR) $(XPM_INC) xpm_w32.c
!if "$(VIMDLL)" == "yes" !if "$(VIMDLL)" == "yes"
$(OUTDIR)/vimc.res: $(OUTDIR) vim.rc gvim.exe.mnf version.h gui_w32_rc.h \ $(OUTDIR)/vimc.res: $(OUTDIR) vim.rc vim.manifest version.h gui_w32_rc.h \
vim.ico vim.ico
$(RC) /nologo /l 0x409 /Fo$@ $(RCFLAGS:-DFEAT_GUI_MSWIN=) vim.rc $(RC) /nologo /l 0x409 /Fo$@ $(RCFLAGS:-DFEAT_GUI_MSWIN=) vim.rc
$(OUTDIR)/vimg.res: $(OUTDIR) vim.rc gvim.exe.mnf version.h gui_w32_rc.h \ $(OUTDIR)/vimg.res: $(OUTDIR) vim.rc vim.manifest version.h gui_w32_rc.h \
vim.ico vim.ico
$(RC) /nologo /l 0x409 /Fo$@ $(RCFLAGS) vim.rc $(RC) /nologo /l 0x409 /Fo$@ $(RCFLAGS) vim.rc
@@ -1819,7 +1819,7 @@ $(OUTDIR)/vimd.res: $(OUTDIR) vim.rc version.h gui_w32_rc.h \
vim_alert.ico vim_info.ico vim_quest.ico vim_alert.ico vim_info.ico vim_quest.ico
$(RC) /nologo /l 0x409 /Fo$@ $(RCFLAGS) -DRCDLL -DVIMDLLBASE=\"$(VIMDLLBASE)\" vim.rc $(RC) /nologo /l 0x409 /Fo$@ $(RCFLAGS) -DRCDLL -DVIMDLLBASE=\"$(VIMDLLBASE)\" vim.rc
!else !else
$(OUTDIR)/vim.res: $(OUTDIR) vim.rc gvim.exe.mnf version.h gui_w32_rc.h \ $(OUTDIR)/vim.res: $(OUTDIR) vim.rc vim.manifest version.h gui_w32_rc.h \
tools.bmp tearoff.bmp vim.ico vim_error.ico \ tools.bmp tearoff.bmp vim.ico vim_error.ico \
vim_alert.ico vim_info.ico vim_quest.ico vim_alert.ico vim_info.ico vim_quest.ico
$(RC) /nologo /l 0x409 /Fo$@ $(RCFLAGS) vim.rc $(RC) /nologo /l 0x409 /Fo$@ $(RCFLAGS) vim.rc

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2883,
/**/ /**/
2882, 2882,
/**/ /**/

6
src/gvim.exe.mnf → src/vim.manifest
View File

@@ -1,4 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
VIM - Vi IMproved by Bram Moolenaar et al.
MS-Windows WinSxS (aka Side-by-side assembly) manifest file
Do ":help uganda" in Vim to read copying and usage conditions.
Do ":help credits" in Vim to see a list of people who contributed.
-->
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" > <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" >
<assemblyIdentity <assemblyIdentity
processorArchitecture="*" processorArchitecture="*"

2
src/vim.rc
View File

@@ -46,7 +46,7 @@ IDR_TOOLBAR1 BITMAP DISCARDABLE "tools.bmp"
# define RT_MANIFEST 24 # define RT_MANIFEST 24
#endif #endif
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "gvim.exe.mnf" CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "vim.manifest"
#endif // RCDLL #endif // RCDLL
// //