diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2007-01-03 03:46:48 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2007-01-03 03:46:48 +0000 |
| commit | 2d20cc40e2463f6bfa2f0e2e06c09e6b92cc9bb0 (patch) | |
| tree | de927579a55802858b8d93f6ebb37e8538f0f30a /packaging | |
| parent | 58532e4e8cbe830d8ff79f98f94c7c92b6827ee5 (diff) | |
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
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 7dcb2e0b4b..08eeac6133 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -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*" |