NSIS: Correctly distribute libsodium with the installer (#14422)
Commit:
https://github.com/vim/vim/commit/19ecb46c55754d31d857688ef0926cda101927d3
Author: Christian Brabandt <c...@256bit.org>
Date: Fri Apr 5 19:14:46 2024 +0100
NSIS: Correctly distribute libsodium with the installer
(https://github.com/vim/vim/issues/14422)
closes: vim/vim-win32-installerhttps://github.com/vim/vim/issues/337
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi
index 7d866ff7c..5574a3334 100644
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -409,6 +409,9 @@ Section "$(str_section_exe)" id_section_exe
File /oname=gvim.exe ${VIMSRC}\gvim_ole.exe
!if /FileExists "${VIMSRC} im${BIT}.dll"
File ${VIMSRC} im${BIT}.dll
+!endif
+!if /FileExists "${VIMRT}\libsodium.dll"
+ File ${VIMRT}\libsodium.dll
!endif
File /oname=install.exe ${VIMSRC}\installw32.exe
File /oname=uninstall.exe ${VIMSRC}\uninstallw32.exe
@@ -429,9 +432,6 @@ Section "$(str_section_exe)" id_section_exe
!if /FileExists "${VIMTOOLS}\winpty-agent.exe"
File ${VIMTOOLS}\winpty-agent.exe
!endif
-!if /FileExists "${VIMTOOLS}\libsodium.dll"
- File ${VIMTOOLS}\libsodium.dll
-!endif
SetOutPath $0
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1rso5l-00AJi3-Mv%40256bit.org.
