diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2005-07-26 17:58:17 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2005-07-26 17:58:17 +0000 |
| commit | 3d0e2f6464dbc2fd9c8e2c9b8157e64a295d7ef8 (patch) | |
| tree | 44008813e6b2f16483c2f0ba1f8308b2e7841184 /packaging | |
| parent | db5add1cc3bed4683206f859ee20ee6eb5969ddf (diff) | |
| download | wireshark-3d0e2f6464dbc2fd9c8e2c9b8157e64a295d7ef8.tar.gz wireshark-3d0e2f6464dbc2fd9c8e2c9b8157e64a295d7ef8.tar.bz2 wireshark-3d0e2f6464dbc2fd9c8e2c9b8157e64a295d7ef8.zip | |
fix detection of old/new WinPcap version, so WinPcap get's only installed by default if the user has a version lower than the delivered 3.1 beta 4
fix statistics tree caption
svn path=/trunk/; revision=15093
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/ethereal.nsi | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/ethereal.nsi index 04f4c60eef..62698c3c7d 100644 --- a/packaging/nsis/ethereal.nsi +++ b/packaging/nsis/ethereal.nsi @@ -10,7 +10,7 @@ ; is no longer the default, so use the /SOLID switch. ; This unfortunately is unknown to NSIS prior to 2.07 and creates an error. ; So if you get an error here, please update to at least NSIS 2.07! -SetCompressor /SOLID lzma +;SetCompressor /SOLID lzma !endif !ifdef GTK1_DIR & GTK2_DIR @@ -655,7 +655,7 @@ File "..\..\plugins\v5ua\v5ua.dll" File "..\..\plugins\xml\xml.dll" SectionEnd -Section "Tree Statistics Plugin (currently http only)" SecStatsTree +Section "Tree Statistics Plugin" SecStatsTree ;------------------------------------------- !ifdef GTK1_DIR & GTK2_DIR SectionIn 1 2 @@ -1070,18 +1070,28 @@ lbl_ignore_wimp: lbl_winpcap_installed: WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 2" "Text" "$WINPCAP_VERSION" - ; starts the version string with "WinPcap 2."? + ; WinPcap 2.x (including betas): the version string starts with "WinPcap 2." StrCpy $1 "$WINPCAP_VERSION" 10 - StrCmp $1 "WinPcap 2." 0 lbl_winpcap_3+ - ; WinPcap 2.x + StrCmp $1 "WinPcap 2." lbl_winpcap_do_install + ; WinPcap 3.0 (including betas): the version string starts with "WinPcap 3.0" + StrCpy $1 "$WINPCAP_VERSION" 11 + StrCmp $1 "WinPcap 3.0" lbl_winpcap_do_install + ; WinPcap 3.1 previous beta's; exact string match + StrCmp "$WINPCAP_VERSION" "WinPcap 3.1 beta" lbl_winpcap_do_install + StrCmp "$WINPCAP_VERSION" "WinPcap 3.1 beta2" lbl_winpcap_do_install + StrCmp "$WINPCAP_VERSION" "WinPcap 3.1 beta3" lbl_winpcap_do_install + +; lbl_winpcap_dont_install: + ; seems to be the current or even a newer version, so don't install + WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "State" "0" + WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 5" "Text" "If selected, the currently installed $WINPCAP_VERSION will be uninstalled first." + Goto lbl_winpcap_done + +lbl_winpcap_do_install: + ; seems to be an old version, install newer one WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "State" "1" WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 5" "Text" "The currently installed $WINPCAP_VERSION will be uninstalled first." - Goto lbl_winpcap_done -lbl_winpcap_3+: - ; WinPcap 3.x (or later) - WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "State" "0" - WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 5" "Text" "If selected, the currently installed $WINPCAP_VERSION will be uninstalled first." lbl_winpcap_done: ; Disable NPF service setting for Win OT |