diff options
author | Bram Moolenaar <Bram@vim.org> | 2022-07-02 17:58:23 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-07-02 17:58:23 +0100 |
commit | daaca8a1281ee610a308cd6209f81a06b3ae3a14 (patch) | |
tree | cb3670076093ddf57926f75e39ea0521b1f223dd | |
parent | 022f9ef16c955d6b5fca0f53b79899c56a3966c5 (diff) | |
download | vim-git-daaca8a1281ee610a308cd6209f81a06b3ae3a14.tar.gz |
patch 9.0.0029: the bitmaps/vim.ico file is not in the distributionv9.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.
-rw-r--r-- | Filelist | 1 | ||||
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | runtime/bitmaps/vim.ico | bin | 0 -> 28786 bytes | |||
-rw-r--r-- | src/version.c | 2 |
4 files changed, 4 insertions, 3 deletions
@@ -624,6 +624,7 @@ SRC_DOS_BIN = \ src/xpm/x86/lib-vc14/libXpm.lib \ src/xpm/x86/lib/libXpm.a \ src/xpm/x86/lib/libXpm.lib \ + runtime/bitmaps/vim.ico \ nsis/icons.zip \ # source files for Amiga, DOS, etc. (also in the extra archive) @@ -414,6 +414,7 @@ dossrc: dist no_title.vim dist/$(COMMENT_SRC) \ tar cf - \ $(SRC_ALL) \ $(SRC_DOS) \ + $(SRC_DOS_BIN) \ $(SRC_AMI_DOS) \ $(SRC_DOS_UNIX) \ runtime/doc/uganda.nsis.txt \ @@ -423,9 +424,6 @@ dossrc: dist no_title.vim dist/$(COMMENT_SRC) \ 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 diff --git a/runtime/bitmaps/vim.ico b/runtime/bitmaps/vim.ico Binary files differnew file mode 100644 index 000000000..6e998b7e2 --- /dev/null +++ b/runtime/bitmaps/vim.ico diff --git a/src/version.c b/src/version.c index 77be61cf8..3c6efdf5d 100644 --- a/src/version.c +++ b/src/version.c @@ -736,6 +736,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 29, +/**/ 28, /**/ 27, |