To: vim_dev@googlegroups.com Subject: Patch 8.2.2883 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2883 Problem: MS-Windows manifest file name is misleading. Solution: Rename the file. (closes #8241) Files: .gitignore, .hgignore, Filelist, Makefile, src/Make_cyg_ming.mak, src/Make_mvc.mak, src/gvim.exe.mnf, src/vim.manifest, src/vim.rc *** ../vim-8.2.2882/.gitignore 2020-04-30 22:50:55.601076830 +0200 --- .gitignore 2021-05-24 18:21:13.448983094 +0200 *************** *** 25,31 **** # Windows *.exe *.idb - *.manifest *.exp *.map *.obj --- 25,30 ---- *** ../vim-8.2.2882/.hgignore 2020-01-09 16:25:46.000287844 +0100 --- .hgignore 2021-05-24 18:21:13.448983094 +0200 *************** *** 26,32 **** # Windows *.exe *.idb - *.manifest *.exp *.map *.obj --- 26,31 ---- *** ../vim-8.2.2882/Filelist 2021-05-02 19:14:55.466643569 +0200 --- Filelist 2021-05-24 18:21:13.448983094 +0200 *************** *** 567,573 **** src/uninstall.c \ src/vim.def \ src/vim.rc \ ! src/gvim.exe.mnf \ src/vimrun.c \ src/xpm_w32.c \ src/xpm_w32.h \ --- 567,573 ---- src/uninstall.c \ src/vim.def \ src/vim.rc \ ! src/vim.manifest \ src/vimrun.c \ src/xpm_w32.c \ src/xpm_w32.h \ *** ../vim-8.2.2882/Makefile 2020-08-13 18:57:56.554214765 +0200 --- Makefile 2021-05-24 18:21:13.448983094 +0200 *************** *** 94,100 **** # 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. # - 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. --- 94,100 ---- # 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/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,158 **** # > cd src # > msvc2015.bat # - Build the console binary: ! # > nmake -f Make_mvc.mak # - Run the tests and check the output: # > nmake -f Make_mvc.mak testclean # > nmake -f Make_mvc.mak test --- 152,158 ---- # > cd src # > msvc2015.bat # - Build the console binary: ! # > nmake -f Mae_mvc.mak # - Run the tests and check the output: # > nmake -f Make_mvc.mak testclean # > nmake -f Make_mvc.mak test *** ../vim-8.2.2882/src/Make_cyg_ming.mak 2021-01-25 19:17:58.817907495 +0100 --- src/Make_cyg_ming.mak 2021-05-24 18:21:13.448983094 +0200 *************** *** 820,830 **** $(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 else ! OBJ += $(OUTDIR)/os_w32exe.o $(OUTDIR)/vimrc.o endif ifdef PERL --- 820,830 ---- $(OUTDIR)/window.o ifeq ($(VIMDLL),yes) ! 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)/vimres.o endif ifdef PERL *************** *** 1145,1165 **** $(CC) -c $(CFLAGS) $< -o $@ ifeq ($(VIMDLL),yes) ! $(OUTDIR)/vimrcc.o: vim.rc gvim.exe.mnf 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 $(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 \ 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 \ tools.bmp tearoff.bmp vim.ico vim_error.ico \ vim_alert.ico vim_info.ico vim_quest.ico $(WINDRES) $(WINDRES_FLAGS) $(DEFINES) \ --- 1145,1165 ---- $(CC) -c $(CFLAGS) $< -o $@ ifeq ($(VIMDLL),yes) ! $(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)/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)/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)/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) \ *** ../vim-8.2.2882/src/Make_mvc.mak 2021-04-21 11:30:19.666720540 +0200 --- src/Make_mvc.mak 2021-05-24 18:21:13.448983094 +0200 *************** *** 1806,1816 **** $(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 \ 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 \ vim.ico $(RC) /nologo /l 0x409 /Fo$@ $(RCFLAGS) vim.rc --- 1806,1816 ---- $(CC) $(CFLAGS_OUTDIR) $(XPM_INC) xpm_w32.c !if "$(VIMDLL)" == "yes" ! $(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 vim.manifest version.h gui_w32_rc.h \ vim.ico $(RC) /nologo /l 0x409 /Fo$@ $(RCFLAGS) vim.rc *************** *** 1819,1825 **** 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 \ 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 --- 1819,1825 ---- 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 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 *** ../vim-8.2.2882/src/gvim.exe.mnf 2019-12-29 13:43:50.324021457 +0100 --- src/gvim.exe.mnf 1970-01-01 01:00:00.000000000 +0100 *************** *** 1,52 **** - - - - Vi Improved - A Text Editor - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - --- 0 ---- *** ../vim-8.2.2882/src/vim.manifest 2021-05-24 18:46:43.056797303 +0200 --- src/vim.manifest 2021-05-24 18:46:02.048911167 +0200 *************** *** 0 **** --- 1,58 ---- + + + + + Vi Improved - A Text Editor + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + *** ../vim-8.2.2882/src/vim.rc 2019-12-11 22:40:07.000000000 +0100 --- src/vim.rc 2021-05-24 18:21:13.448983094 +0200 *************** *** 46,52 **** # define RT_MANIFEST 24 #endif ! CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "gvim.exe.mnf" #endif // RCDLL // --- 46,52 ---- # define RT_MANIFEST 24 #endif ! CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "vim.manifest" #endif // RCDLL // *** ../vim-8.2.2882/src/version.c 2021-05-24 15:45:25.626174865 +0200 --- src/version.c 2021-05-24 18:23:19.804644872 +0200 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2883, /**/ -- A poem: read aloud: <> !*''# Waka waka bang splat tick tick hash, ^"`$$- Caret quote back-tick dollar dollar dash, !*=@$_ Bang splat equal at dollar under-score, %*<> ~#4 Percent splat waka waka tilde number four, &[]../ Ampersand bracket bracket dot dot slash, |{,,SYSTEM HALTED Vertical-bar curly-bracket comma comma CRASH. Fred Bremmer and Steve Kroese (Calvin College & Seminary of Grand Rapids, MI.) /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///