Patch 8.2.2883

8 views
Skip to first unread message

Bram Moolenaar

unread,
May 24, 2021, 12:49:03 PM5/24/21
to vim...@googlegroups.com

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 ****
- <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
- <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" >
- <assemblyIdentity
- processorArchitecture="*"
- version="8.2.0.0"
- type="win32"
- name="Vim"
- />
- <description>Vi Improved - A Text Editor</description>
- <dependency>
- <dependentAssembly>
- <assemblyIdentity
- type="win32"
- name="Microsoft.Windows.Common-Controls"
- version="6.0.0.0"
- publicKeyToken="6595b64144ccf1df"
- language="*"
- processorArchitecture="*"
- />
- </dependentAssembly>
- </dependency>
- <!-- Vista security requirements -->
- <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
- <security>
- <requestedPrivileges>
- <requestedExecutionLevel
- level="asInvoker"
- uiAccess="false"/>
- </requestedPrivileges>
- </security>
- </trustInfo>
- <!-- Vista High DPI aware -->
- <asmv3:application>
- <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
- <dpiAware>true</dpiAware>
- </asmv3:windowsSettings>
- </asmv3:application>
- <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
- <application>
- <!--The ID below indicates application support for Windows Vista -->
- <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
- <!--The ID below indicates application support for Windows 7 -->
- <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
- <!--The ID below indicates application support for Windows 8 -->
- <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
- <!--The ID below indicates application support for Windows 8.1 -->
- <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
- <!--The ID below indicates application support for Windows 10 -->
- <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
- </application>
- </compatibility>
- </assembly>
--- 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 ----
+ <?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="*"
+ version="8.2.0.0"
+ type="win32"
+ name="Vim"
+ />
+ <description>Vi Improved - A Text Editor</description>
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity
+ type="win32"
+ name="Microsoft.Windows.Common-Controls"
+ version="6.0.0.0"
+ publicKeyToken="6595b64144ccf1df"
+ language="*"
+ processorArchitecture="*"
+ />
+ </dependentAssembly>
+ </dependency>
+ <!-- Vista security requirements -->
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel
+ level="asInvoker"
+ uiAccess="false"/>
+ </requestedPrivileges>
+ </security>
+ </trustInfo>
+ <!-- Vista High DPI aware -->
+ <asmv3:application>
+ <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+ <dpiAware>true</dpiAware>
+ </asmv3:windowsSettings>
+ </asmv3:application>
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
+ <!--The ID below indicates application support for Windows Vista -->
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+ <!--The ID below indicates application support for Windows 7 -->
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ <!--The ID below indicates application support for Windows 8 -->
+ <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+ <!--The ID below indicates application support for Windows 8.1 -->
+ <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+ <!--The ID below indicates application support for Windows 10 -->
+ <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+ </application>
+ </compatibility>
+ </assembly>
*** ../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 -- Br...@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 ///
Reply all
Reply to author
Forward
0 new messages