patch 8.2.2883: MS-Windows manifest file name is misleading

Problem:    MS-Windows manifest file name is misleading.
Solution:   Rename the file. (closes #8241)

diff --git a/.gitignore b/.gitignore
index 8623fdebf0db480e4d04627f233c8615dee5b838..8b28377821992813bf2e1c4fe44bbcd7dbe754ff 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -25,7 +25,6 @@ src/auto/pathdef.c
 # Windows
 *.exe
 *.idb
-*.manifest
 *.exp
 *.map
 *.obj

diff --git a/.hgignore b/.hgignore
index d266dda0913e9bf01ad1731ce26eac5df578afc2..2153023a8d3abe40fab12d592f9fff6c3081aaef 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -26,7 +26,6 @@ src/auto/pathdef.c
 # Windows
 *.exe
 *.idb
-*.manifest
 *.exp
 *.map
 *.obj

diff --git a/Filelist b/Filelist
index 60d6278922f241fb905cac8e5b0a3048e2fc626f..66fe467a9c33b63a82413791b1626d2d2eb1172b 100644 (file)
--- a/Filelist
+++ b/Filelist
@@ -567,7 +567,7 @@ SRC_DOS =   \
                src/uninstall.c \
                src/vim.def \
                src/vim.rc \
-               src/gvim.exe.mnf \
+               src/vim.manifest \
                src/vimrun.c \
                src/xpm_w32.c \
                src/xpm_w32.h \

diff --git a/Makefile b/Makefile
index 35119ac1f6c6450b05b7a951a824283cb247237b..e377392b520adb4907156593ccdc57dcbcb17935 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -94,7 +94,7 @@ MINOR = 2
 #   src/Makefile, README.txt, README.md, src/README.md, READMEdir/README*.txt,
 #   runtime/doc/*.txt and make nsis/gvim_version.nsh.
 #   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
 #   "huge" features.  Add MZscheme if you can make it work.
 #   Use "make reconfig" after selecting the configure arguments.
@@ -152,7 +152,7 @@ MINOR = 2
 #   > cd src
 #   > msvc2015.bat
 # - Build the console binary:
-#   > nmake -f Make_mvc.mak
+#   > nmake -f Mae_mvc.mak
 # - Run the tests and check the output:
 #   > nmake -f Make_mvc.mak testclean
 #   > nmake -f Make_mvc.mak test

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 8895d2797fb2a32cb586a19739a63f52026b796c..0be3abbaa1c557d3e8429b32591934c69beb015a 100644 (file)
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -820,11 +820,11 @@ OBJ = \
        $(OUTDIR)/window.o
 
 ifeq ($(VIMDLL),yes)
-OBJ += $(OUTDIR)/os_w32dll.o $(OUTDIR)/vimrcd.o
-EXEOBJC = $(OUTDIR)/os_w32exec.o $(OUTDIR)/vimrcc.o
-EXEOBJG = $(OUTDIR)/os_w32exeg.o $(OUTDIR)/vimrcg.o
+OBJ += $(OUTDIR)/os_w32dll.o $(OUTDIR)/vimresd.o
+EXEOBJC = $(OUTDIR)/os_w32exec.o $(OUTDIR)/vimresc.o
+EXEOBJG = $(OUTDIR)/os_w32exeg.o $(OUTDIR)/vimresg.o
 else
-OBJ += $(OUTDIR)/os_w32exe.o $(OUTDIR)/vimrc.o
+OBJ += $(OUTDIR)/os_w32exe.o $(OUTDIR)/vimres.o
 endif
 
 ifdef PERL
@@ -1145,21 +1145,21 @@ $(OUTDIR)/%.o : %.c $(INCL)
        $(CC) -c $(CFLAGS) $< -o $@
 
 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 \
            --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) \
            --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 \
                        vim_alert.ico vim_info.ico vim_quest.ico
        $(WINDRES) $(WINDRES_FLAGS) $(DEFINES) -DRCDLL -DVIMDLLBASE=\\\"$(VIMDLLBASE)\\\" \
            --input-format=rc --output-format=coff -i vim.rc -o $@
 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 \
                        vim_alert.ico vim_info.ico vim_quest.ico
        $(WINDRES) $(WINDRES_FLAGS) $(DEFINES) \

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 0f5611a4341038caa2a7ab76dc1f9e0e3d5658a1..30f8175e25c8ea15b43ef7997301f85b2b0e2747 100644 (file)
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -1806,11 +1806,11 @@ $(OUTDIR)/xpm_w32.obj: $(OUTDIR) xpm_w32.c
        $(CC) $(CFLAGS_OUTDIR) $(XPM_INC) xpm_w32.c
 
 !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
        $(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
        $(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
        $(RC) /nologo /l 0x409 /Fo$@ $(RCFLAGS) -DRCDLL -DVIMDLLBASE=\"$(VIMDLLBASE)\" vim.rc
 !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 \
                                vim_alert.ico vim_info.ico vim_quest.ico
        $(RC) /nologo /l 0x409 /Fo$@ $(RCFLAGS) vim.rc

diff --git a/src/version.c b/src/version.c
index 378e846f7361ad2d5aaf9d2ee93e1410dcff6bdc..517e832611e284c8063b06471c6bfe8ffb4bb434 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2883,
 /**/
     2882,
 /**/

diff --git a/src/gvim.exe.mnf b/src/vim.manifest
similarity index 88%
rename from src/gvim.exe.mnf
rename to src/vim.manifest
index e5c250ff2d83419f3def7dd0533b74917fe1e043..8768b3f9137ba7fc3d9ba0992626de683bc56fbf 100644 (file)
--- a/src/gvim.exe.mnf
+++ b/src/vim.manifest
@@ -1,4 +1,10 @@
 <?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" >
   <assemblyIdentity
     processorArchitecture="*"

diff --git a/src/vim.rc b/src/vim.rc
index 35beb97c5e2578a3ce2eea6ef77730bea04efd73..abb944b35a7de18a0a55a4747f64cbed4975eaa7 100644 (file)
--- a/src/vim.rc
+++ b/src/vim.rc
@@ -46,7 +46,7 @@ IDR_TOOLBAR1  BITMAP  DISCARDABLE  "tools.bmp"
 # define RT_MANIFEST 24
 #endif
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "gvim.exe.mnf"
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "vim.manifest"
 #endif // RCDLL
 
 //