Patch 9.0.0029

[Bram Moolenaar]

Patch 9.0.0029
Problem: The bitmaps/vim.ico file is not in the distribution.
Solution: Add it back to the distribution. Adjust the build rules to have
it end up in the right place.
Files: Filelist, Makefile


*** ../vim-9.0.0028/Filelist 2022-06-23 13:03:57.000000000 +0100
--- Filelist 2022-07-02 17:43:03.187949702 +0100
***************
*** 15,21 ****
.gitignore \
.hgignore \
.lgtm.yml \
- .travis.yml \
.appveyor.yml \
.codecov.yml \
ci/appveyor.bat \
--- 15,20 ----
***************
*** 1018,1023 ****
--- 1017,1023 ----
runtime/spell/??/*.diff \
runtime/spell/??/main.aap \
runtime/spell/sr/README_sr.txt \
+ runtime/spell/sr/convert.vim \
runtime/spell/tet/*.diff \
runtime/spell/tet/main.aap \
runtime/spell/check/main.aap \
*** ../vim-9.0.0028/Makefile 2022-06-28 11:21:34.000000000 +0100
--- Makefile 2022-07-02 17:51:04.340304133 +0100
***************
*** 144,150 ****
# - > make dossrc
# > make dosrt
# Unpack dist/vim##rt.zip and dist/vim##src.zip on an MS-Windows PC.
! # This creates the directory vim/vim82 and puts all files in there.
# Win32 console version build:
# - See src/INSTALLpc.txt for installing the compiler and SDK.
# - Set environment for Visual C++ 2015:
--- 144,150 ----
# - > make dossrc
# > make dosrt
# Unpack dist/vim##rt.zip and dist/vim##src.zip on an MS-Windows PC.
! # This creates the directory vim/vim90 and puts all files in there.
# Win32 console version build:
# - See src/INSTALLpc.txt for installing the compiler and SDK.
# - Set environment for Visual C++ 2015:
***************
*** 202,208 ****
# Note: VisVim needs to be build with MSVC 5, newer versions don't work.
# gvimext64.dll can be obtained from:
# https://github.com/vim/vim-win32-installer/releases
! # It is part of gvim_8.2.*_x64.zip as vim/vim82/GvimExt/gvimext64.dll.
# - Make sure there is a diff.exe two levels up (get it from a previous Vim
# version). Also put winpty32.dll and winpty-agent.exe there.
# - go to ../nsis and do:
--- 202,208 ----
# Note: VisVim needs to be build with MSVC 5, newer versions don't work.
# gvimext64.dll can be obtained from:
# https://github.com/vim/vim-win32-installer/releases
! # It is part of gvim_9.0.*_x64.zip as vim/vim90/GvimExt/gvimext64.dll.
# - Make sure there is a diff.exe two levels up (get it from a previous Vim
# version). Also put winpty32.dll and winpty-agent.exe there.
# - go to ../nsis and do:
***************
*** 414,419 ****
--- 414,420 ----
tar cf - \
$(SRC_ALL) \
$(SRC_DOS) \
+ $(SRC_DOS_BIN) \
$(SRC_AMI_DOS) \
$(SRC_DOS_UNIX) \
runtime/doc/uganda.nsis.txt \
***************
*** 423,431 ****
rmdir dist/vim/$(VIMRTDIR)/runtime
# This file needs to be in dos fileformat for NSIS.
$(VIM) -e -X -u no_title.vim -c ":set tx|wq" dist/vim/$(VIMRTDIR)/doc/uganda.nsis.txt
- tar cf - \
- $(SRC_DOS_BIN) \
- | (cd dist/vim/$(VIMRTDIR); tar xf -)
cd dist && zip -9 -rD -z vim$(VERSION)src.zip vim <$(COMMENT_SRC)

runtime/doc/uganda.nsis.txt: runtime/doc/uganda.txt
--- 424,429 ----
*** ../vim-9.0.0028/src/version.c 2022-07-02 17:36:27.332515941 +0100
--- src/version.c 2022-07-02 17:47:46.468133450 +0100
***************
*** 737,738 ****
--- 737,740 ----
{ /* Add new patch number below this line */
+ /**/
+ 29,
/**/

--
You have the right to remain silent. Anything you say will be
misquoted, then used against you.

/// 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 ///