Mercurial > vim
changeset 36262:6937334e99e9 draft
NSIS: Include libgcc_s_sjlj-1.dll again
Commit: https://github.com/vim/vim/commit/48f3833ff08def074b840d887f3e96c9cf7d2d15
Author: K.Takata <kentkt@csc.jp>
Date: Mon Oct 7 20:37:00 2024 +0200
NSIS: Include libgcc_s_sjlj-1.dll again
gettext-iconv-windows v0.22.5a-v1.17 requires libgcc_s_sjlj-1.dll again.
Add a new option ${INCLUDE_LIBGCC} to control whether it should be
included in the package.
This partly reverts 49f1e1979f9c3a4d7b28f0961bca0e41227a0557.
Related: https://github.com/vim/vim-win32-installer/pull/355
closes: #15819
Signed-off-by: K.Takata <kentkt@csc.jp>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Mon, 07 Oct 2024 20:45:09 +0200 |
| parents | a5b171931d49 |
| children | 72c993847256 |
| files | nsis/gvim.nsi |
| diffstat | 1 files changed, 22 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/nsis/gvim.nsi +++ b/nsis/gvim.nsi @@ -53,6 +53,12 @@ Unicode true !define WIN64 0 !endif +# if you don't want to include libgcc_s_sjlj-1.dll in the package, use the +# switch /DINCLUDE_LIBGCC=0 on the command line makensis.exe. +!ifndef INCLUDE_LIBGCC + !define INCLUDE_LIBGCC 1 +!endif + !include gvim_version.nsh # for version number # Definition of Patch for Vim. @@ -728,12 +734,14 @@ Section "$(str_section_nls)" id_section_ !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ "${GETTEXT}\gettext${BIT}\libiconv-2.dll" \ "$0\libiconv-2.dll" "$0" -# Install libgcc_s_sjlj-1.dll only if it is needed. -# !if /FileExists "${GETTEXT}\gettext${BIT}\libgcc_s_sjlj-1.dll" -# !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ -# "${GETTEXT}\gettext${BIT}\libgcc_s_sjlj-1.dll" \ -# "$0\libgcc_s_sjlj-1.dll" "$0" -# !endif +!if ${INCLUDE_LIBGCC} +!if /FileExists "${GETTEXT}\gettext${BIT}\libgcc_s_sjlj-1.dll" + # Install libgcc_s_sjlj-1.dll only if it is needed. + !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ + "${GETTEXT}\gettext${BIT}\libgcc_s_sjlj-1.dll" \ + "$0\libgcc_s_sjlj-1.dll" "$0" +!endif +!endif ${If} ${SectionIsSelected} ${id_section_editwith} ${If} ${RunningX64} @@ -759,12 +767,14 @@ Section "$(str_section_nls)" id_section_ !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ "${GETTEXT}\gettext32\libiconv-2.dll" \ "$0\GvimExt32\libiconv-2.dll" "$0\GvimExt32" -# Install libgcc_s_sjlj-1.dll only if it is needed. -# !if /FileExists "${GETTEXT}\gettext32\libgcc_s_sjlj-1.dll" -# !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ -# "${GETTEXT}\gettext32\libgcc_s_sjlj-1.dll" \ -# "$0\GvimExt32\libgcc_s_sjlj-1.dll" "$0\GvimExt32" -# !endif +!if ${INCLUDE_LIBGCC} +!if /FileExists "${GETTEXT}\gettext32\libgcc_s_sjlj-1.dll" + # Install libgcc_s_sjlj-1.dll only if it is needed. + !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ + "${GETTEXT}\gettext32\libgcc_s_sjlj-1.dll" \ + "$0\GvimExt32\libgcc_s_sjlj-1.dll" "$0\GvimExt32" +!endif +!endif ${EndIf} SectionEnd !endif