Commit: NSIS: Fix a few issues with gvim.nsi

[Christian Brabandt]

NSIS: Fix a few issues with gvim.nsi

Commit: https://github.com/vim/vim/commit/49f1e1979f9c3a4d7b28f0961bca0e41227a0557
Author: RestorerZ <rest...@mail2k.ru>
Date: Tue Apr 9 23:04:44 2024 +0200

NSIS: Fix a few issues with gvim.nsi

- correctly find libsodium.dll
- disable inclusion of libgcc_s_sjlj-1.dll
- generate PATCHLEVEL correctly

related: #14214
closes: #14465

Signed-off-by: RestorerZ <rest...@mail2k.ru>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi
index 5574a3334..b8ef079db 100644
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -409,9 +409,6 @@ 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
@@ -432,6 +429,9 @@ 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

[Christ van Willegen]

Hi,

Looking at the diff, I can only see that the path to libsodium has changed, but I don't see any references to libgcc_s_sjlj-1.dll nor anything that looks like a PATCHLEVEL.

Was there more to include in this patch?

Christ van Willegen

[Christian Brabandt]

Yeah, the email did not contain the complete patch. It's here:
https://github.com/vim/vim/commit/49f1e1979f9c3a4d7b28f0961bca0e41227a0557

Don't know how this happened.

Thanks,
Christian
--
The questions remain the same. The answers are eternally variable.