osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

from Laurent Rabret: 

"Apply the ugly attached patch to the installer"

... it's not that ugly at all - and installs (deletes) the manifest files if available

svn path=/trunk/; revision=20285
This commit is contained in:
Ulf Lamping 2007-01-03 03:46:48 +00:00
parent 58532e4e8c
commit 2d20cc40e2
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packaging/nsis/wireshark.nsi
View File

@ -307,8 +307,11 @@ File "${GLIB_DIR}\bin\libgmodule-2.0-0.dll"
File "${GLIB_DIR}\bin\libgobject-2.0-0.dll"
File "${ICONV_DIR}\bin\iconv.dll"
File "${GETTEXT_DIR}\bin\intl.dll"
File "..\..\*.manifest"
!ifdef ZLIB_DIR
File "${ZLIB_DIR}\zlib1.dll"
IfFileExists ${ZLIB_DIR}\zlib1.dll.manifest 0 +2
File "${ZLIB_DIR}\zlib1.dll.manifest"
!endif
!ifdef ADNS_DIR
File "${ADNS_DIR}\adns_win32\LIB\adns_dll.dll"
@ -647,6 +650,8 @@ SectionIn 1 RO
!endif
SetOutPath $INSTDIR
File /oname=wireshark.exe "..\..\wireshark-gtk2.exe"
IfFileExists $INSTDIR\wireshark-gtk2.exe.manifest 0 +2
Rename $INSTDIR\wireshark-gtk2.exe.manifest $INSTDIR\wireshark.exe.manifest
File "${GTK2_DIR}\bin\libgdk-win32-2.0-0.dll"
File "${GTK2_DIR}\bin\libgdk_pixbuf-2.0-0.dll"
File "${GTK2_DIR}\bin\libgtk-win32-2.0-0.dll"
@ -914,6 +919,7 @@ Delete "$INSTDIR\*.dll"
Delete "$INSTDIR\*.html"
Delete "$INSTDIR\COPYING"
Delete "$INSTDIR\AUTHORS-SHORT"
Delete "$INSTDIR\*.manifest"
; previous versions installed this file
Delete "$INSTDIR\AUTHORS-SHORT-FORMAT"
Delete "$INSTDIR\README*"