diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-03-26 23:02:46 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-03-26 23:02:46 +0100 |
| commit | 6a95c889bf5ac81377bf5bb42a9d5d7e5cd3b1e2 (patch) | |
| tree | 74fedc34af6befe141e1ae124709aaab6b02883d | |
| parent | e99be0e6d28fad96efd2b2be23fa38e7559e80e1 (diff) | |
| download | vim-git-6a95c889bf5ac81377bf5bb42a9d5d7e5cd3b1e2.tar.gz | |
patch 8.1.1057: nsis config is too complicatedv8.1.1057
Problem: Nsis config is too complicated.
Solution: Use "File /r" for the macros and pack directories. (Ken Takata,
closes #4169)
| -rw-r--r-- | nsis/gvim.nsi | 40 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 36 deletions
diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi index 9f9fb4ed5..8336093be 100644 --- 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 c23e834bd..8a9d8b98a 100644 --- a/src/version.c +++ b/src/version.c @@ -776,6 +776,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1057, +/**/ 1056, /**/ 1055, |