From 24877cf22c59acefc69c33d8368841a149135fed Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 10 Jan 2019 21:51:48 +0100 Subject: patch 8.1.0713: images for NSIS take up too much space Problem: Images for NSIS take up too much space. Solution: Put the images in a zip file. --- Filelist | 4 +- Makefile | 10 +- nsis/README.txt | 5 + nsis/icons.zip | Bin 0 -> 121873 bytes nsis/icons/disabled.bmp | Bin 358 -> 0 bytes nsis/icons/enabled.bmp | Bin 358 -> 0 bytes nsis/icons/header.bmp | Bin 102654 -> 0 bytes nsis/icons/header.svg | 265 ----------------------------------------- nsis/icons/un_header.bmp | Bin 102654 -> 0 bytes nsis/icons/uninstall.bmp | Bin 618006 -> 0 bytes nsis/icons/vim_16c.ico | Bin 766 -> 0 bytes nsis/icons/vim_uninst_16c.ico | Bin 766 -> 0 bytes nsis/icons/welcome.bmp | Bin 618006 -> 0 bytes nsis/icons/welcome.svg | 268 ------------------------------------------ src/version.c | 2 + 15 files changed, 14 insertions(+), 540 deletions(-) create mode 100644 nsis/icons.zip delete mode 100644 nsis/icons/disabled.bmp delete mode 100644 nsis/icons/enabled.bmp delete mode 100644 nsis/icons/header.bmp delete mode 100644 nsis/icons/header.svg delete mode 100644 nsis/icons/un_header.bmp delete mode 100644 nsis/icons/uninstall.bmp delete mode 100644 nsis/icons/vim_16c.ico delete mode 100644 nsis/icons/vim_uninst_16c.ico delete mode 100644 nsis/icons/welcome.bmp delete mode 100644 nsis/icons/welcome.svg diff --git a/Filelist b/Filelist index b2b80095e9..6e3052170c 100644 --- a/Filelist +++ b/Filelist @@ -517,9 +517,7 @@ SRC_DOS_BIN = \ src/xpm/x86/lib/libXpm.a \ src/xpm/x86/lib/libXpm.lib \ src/xpm/x86/lib-vc14/libXpm.lib \ - nsis/icons/*.bmp \ - nsis/icons/*.ico \ - nsis/icons/*.svg \ + nsis/icons.zip \ # source files for Amiga, DOS, etc. (also in the extra archive) SRC_AMI_DOS = \ diff --git a/Makefile b/Makefile index 6cbdc72ddc..16fc84ccdc 100644 --- a/Makefile +++ b/Makefile @@ -205,6 +205,7 @@ MINOR = 1 # - 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: +# > unzip icons.zip # > makensis gvim.nsi (takes a few minutes). # ignore warning for libwinpthread-1.dll # - Copy gvim##.exe to the dist directory. @@ -468,11 +469,12 @@ dosrt_files: dist prepare no_title.vim -rm $(IN_README_DIR) mv dist/vim/$(VIMRTDIR)/runtime/* dist/vim/$(VIMRTDIR) rmdir dist/vim/$(VIMRTDIR)/runtime -# Add the message translations. Trick: skip ja.mo and use ja.sjis.mo instead. -# Same for cs.mo / cs.cp1250.mo, pl.mo / pl.cp1250.mo, sk.mo / sk.cp1250.mo, -# zh_CN.mo / zh_CN.cp936.mo, uk.mo / uk.cp1251.mo and ru.mo / ru.cp1251.mo. +# Add the message translations. Trick: skip ja.mo/ja.euc-jp.mo and use +# ja.sjis.mo instead. Same for cs.mo / cs.cp1250.mo, pl.mo / pl.cp1250.mo, +# sk.mo / sk.cp1250.mo, zh_CN.mo / zh_CN.cp936.mo, uk.mo / uk.cp1251.mo and +# ru.mo / ru.cp1251.mo. for i in $(LANG_DOS); do \ - if test "$$i" != "src/po/ja.mo" -a "$$i" != "src/po/pl.mo" -a "$$i" != "src/po/cs.mo" -a "$$i" != "src/po/sk.mo" -a "$$i" != "src/po/zh_CN.mo" -a "$$i" != "src/po/ru.mo" -a "$$i" != "src/po/uk.mo"; then \ + if test "$$i" != "src/po/ja.mo" -a "$$i" != "src/po/ja.euc-jp.mo" -a "$$i" != "src/po/pl.mo" -a "$$i" != "src/po/cs.mo" -a "$$i" != "src/po/sk.mo" -a "$$i" != "src/po/zh_CN.mo" -a "$$i" != "src/po/ru.mo" -a "$$i" != "src/po/uk.mo"; then \ n=`echo $$i | sed -e "s+src/po/\([-a-zA-Z0-9_]*\(.UTF-8\)*\)\(.sjis\)*\(.cp1250\)*\(.cp1251\)*\(.cp936\)*.mo+\1+"`; \ mkdir dist/vim/$(VIMRTDIR)/lang/$$n; \ mkdir dist/vim/$(VIMRTDIR)/lang/$$n/LC_MESSAGES; \ diff --git a/nsis/README.txt b/nsis/README.txt index f5348e91ea..6ecc57941e 100644 --- a/nsis/README.txt +++ b/nsis/README.txt @@ -67,6 +67,11 @@ To build the installable .exe: Install NSIS if you didn't do that already. Also install UPX, if you want a compressed file. +Unpack the images: + cd nsis + unzip icons.zip + To build then, enter: + cd nsis makensis gvim.nsi diff --git a/nsis/icons.zip b/nsis/icons.zip new file mode 100644 index 0000000000..5dddbbe65a Binary files /dev/null and b/nsis/icons.zip differ diff --git a/nsis/icons/disabled.bmp b/nsis/icons/disabled.bmp deleted file mode 100644 index 8f6b6d4e66..0000000000 Binary files a/nsis/icons/disabled.bmp and /dev/null differ diff --git a/nsis/icons/enabled.bmp b/nsis/icons/enabled.bmp deleted file mode 100644 index 766e11a932..0000000000 Binary files a/nsis/icons/enabled.bmp and /dev/null differ diff --git a/nsis/icons/header.bmp b/nsis/icons/header.bmp deleted file mode 100644 index c2f426953c..0000000000 Binary files a/nsis/icons/header.bmp and /dev/null differ diff --git a/nsis/icons/header.svg b/nsis/icons/header.svg deleted file mode 100644 index 21e60fbc46..0000000000 --- a/nsis/icons/header.svg +++ /dev/null @@ -1,265 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - The editor - Theeditor - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/nsis/icons/un_header.bmp b/nsis/icons/un_header.bmp deleted file mode 100644 index 4b6516951f..0000000000 Binary files a/nsis/icons/un_header.bmp and /dev/null differ diff --git a/nsis/icons/uninstall.bmp b/nsis/icons/uninstall.bmp deleted file mode 100644 index 223d6a45df..0000000000 Binary files a/nsis/icons/uninstall.bmp and /dev/null differ diff --git a/nsis/icons/vim_16c.ico b/nsis/icons/vim_16c.ico deleted file mode 100644 index de18d1d96f..0000000000 Binary files a/nsis/icons/vim_16c.ico and /dev/null differ diff --git a/nsis/icons/vim_uninst_16c.ico b/nsis/icons/vim_uninst_16c.ico deleted file mode 100644 index 8196e68740..0000000000 Binary files a/nsis/icons/vim_uninst_16c.ico and /dev/null differ diff --git a/nsis/icons/welcome.bmp b/nsis/icons/welcome.bmp deleted file mode 100644 index 6ef2a9b995..0000000000 Binary files a/nsis/icons/welcome.bmp and /dev/null differ diff --git a/nsis/icons/welcome.svg b/nsis/icons/welcome.svg deleted file mode 100644 index bf99194308..0000000000 --- a/nsis/icons/welcome.svg +++ /dev/null @@ -1,268 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - The editor - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/version.c b/src/version.c index aaf12c219a..1f9d8095ac 100644 --- a/src/version.c +++ b/src/version.c @@ -799,6 +799,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 713, /**/ 712, /**/ -- cgit v1.2.3