patch 8.1.1057: nsis config is too complicated

Problem:    Nsis config is too complicated.
Solution:   Use "File /r" for the macros and pack directories. (Ken Takata,
            closes #4169)

diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi
index 9f9fb4ed53113728983b39a2f959613aa8779814..8336093be2c070992dd9f8c014b8a5a60c3ee170 100644 (file)
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -354,42 +354,10 @@ Section "$(str_section_exe)" id_section_exe
        File ${VIMRT}\indent\*.*
 
        SetOutPath $0\macros
-       File ${VIMRT}\macros\*.*
-       SetOutPath $0\macros\hanoi
-       File ${VIMRT}\macros\hanoi\*.*
-       SetOutPath $0\macros\life
-       File ${VIMRT}\macros\life\*.*
-       SetOutPath $0\macros\maze
-       File ${VIMRT}\macros\maze\*.*
-       SetOutPath $0\macros\urm
-       File ${VIMRT}\macros\urm\*.*
-
-       SetOutPath $0\pack\dist\opt\dvorak\dvorak
-       File ${VIMRT}\pack\dist\opt\dvorak\dvorak\*.*
-       SetOutPath $0\pack\dist\opt\dvorak\plugin
-       File ${VIMRT}\pack\dist\opt\dvorak\plugin\*.*
-
-       SetOutPath $0\pack\dist\opt\editexisting\plugin
-       File ${VIMRT}\pack\dist\opt\editexisting\plugin\*.*
-
-       SetOutPath $0\pack\dist\opt\justify\plugin
-       File ${VIMRT}\pack\dist\opt\justify\plugin\*.*
-
-       SetOutPath $0\pack\dist\opt\matchit\doc
-       File ${VIMRT}\pack\dist\opt\matchit\doc\*.*
-       SetOutPath $0\pack\dist\opt\matchit\plugin
-       File ${VIMRT}\pack\dist\opt\matchit\plugin\*.*
-       SetOutPath $0\pack\dist\opt\matchit\autoload
-       File ${VIMRT}\pack\dist\opt\matchit\autoload\*.*
-
-       SetOutPath $0\pack\dist\opt\shellmenu\plugin
-       File ${VIMRT}\pack\dist\opt\shellmenu\plugin\*.*
-
-       SetOutPath $0\pack\dist\opt\swapmouse\plugin
-       File ${VIMRT}\pack\dist\opt\swapmouse\plugin\*.*
-
-       SetOutPath $0\pack\dist\opt\termdebug\plugin
-       File ${VIMRT}\pack\dist\opt\termdebug\plugin\*.*
+       File /r ${VIMRT}\macros\*.*
+
+       SetOutPath $0\pack
+       File /r ${VIMRT}\pack\*.*
 
        SetOutPath $0\plugin
        File ${VIMRT}\plugin\*.*

diff --git a/src/version.c b/src/version.c
index c23e834bd0e8c8ede786f2cef8f156c07eb2cb7a..8a9d8b98a4ff9e70413ff791079d011bff6b76b5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -775,6 +775,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1057,
 /**/
     1056,
 /**/