NSIS: Possibility to include translated license and README.txt files (#14311)
* NSIS: Possibility to include translated license and README.txt files
* fixed a missing semicolon
* Disable always show dialog choice language
Signed-off-by: RestorerZ <restorer@mail2k.ru>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/Makefile b/Makefile
index 0d352eb..f4db80f 100644
--- a/Makefile
+++ b/Makefile
@@ -267,7 +267,7 @@
# Copy README files to the top directory.
prepare:
if test -f runtime/doc/uganda.nsis.txt; then \
- rm runtime/doc/uganda.nsis.txt; fi
+ rm runtime/doc/uganda.nsis.???; fi
for name in $(IN_README_DIR); do \
cp READMEdir/"$$name" .; \
done
@@ -407,12 +407,8 @@
gzip -9 dist/vim$(VERSION)src.tar
mv dist/vim$(VERSION)src.tar.gz dist/vim$(VERSION)src.tgz
-no_title.vim: Makefile
- echo "set notitle noicon nocp nomodeline viminfo=" >no_title.vim
-
# MS-DOS sources
-dossrc: dist no_title.vim dist/$(COMMENT_SRC) \
- runtime/doc/uganda.nsis.txt \
+dossrc: dist dist/$(COMMENT_SRC) runtime/doc/uganda.nsis.txt \
nsis/gvim_version.nsh
-rm -rf dist/vim$(VERSION)src.zip
-rm -rf dist/vim
@@ -424,16 +420,14 @@
$(SRC_DOS_BIN) \
$(SRC_AMI_DOS) \
$(SRC_DOS_UNIX) \
- runtime/doc/uganda.nsis.txt \
+ runtime/doc/uganda.nsis.??? \
nsis/gvim_version.nsh \
| (cd dist/vim/$(VIMRTDIR); tar xf -)
mv dist/vim/$(VIMRTDIR)/runtime/* dist/vim/$(VIMRTDIR)
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
cd dist && zip -9 -rD -z vim$(VERSION)src.zip vim <$(COMMENT_SRC)
-runtime/doc/uganda.nsis.txt: runtime/doc/uganda.txt
+runtime/doc/uganda.nsis.txt: runtime/doc/uganda.???
cd runtime/doc && $(MAKE) uganda.nsis.txt
nsis/gvim_version.nsh: Makefile
@@ -450,7 +444,7 @@
# Split in two parts to avoid an "argument list too long" error.
# We no longer convert the files from unix to dos fileformat.
-dosrt_files: dist prepare no_title.vim
+dosrt_files: dist prepare
-rm -rf dist/vim
mkdir dist/vim
mkdir dist/vim/$(VIMRTDIR)
@@ -506,7 +500,7 @@
-rm $(IN_README_DIR)
# make Win32 gvim
-dosbin_gvim: dist no_title.vim dist/$(COMMENT_GVIM)
+dosbin_gvim: dist dist/$(COMMENT_GVIM)
-rm -rf dist/gvim$(VERSION).zip
-rm -rf dist/vim
mkdir dist/vim
@@ -528,7 +522,7 @@
cp gvim.pdb dist/gvim$(VERSION).pdb
# make Win32 console
-dosbin_w32: dist no_title.vim dist/$(COMMENT_W32)
+dosbin_w32: dist dist/$(COMMENT_W32)
-rm -rf dist/vim$(VERSION)w32.zip
-rm -rf dist/vim
mkdir dist/vim
@@ -545,7 +539,7 @@
cp vimw32.pdb dist/vim$(VERSION)w32.pdb
# make Win32 gvim with OLE
-dosbin_ole: dist no_title.vim dist/$(COMMENT_OLE)
+dosbin_ole: dist dist/$(COMMENT_OLE)
-rm -rf dist/gvim$(VERSION)ole.zip
-rm -rf dist/vim
mkdir dist/vim