aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
Diffstat (limited to 'packaging')
-rw-r--r--packaging/nsis/wireshark.nsi8
-rw-r--r--packaging/wix/Prerequisites.wxi8
2 files changed, 14 insertions, 2 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index a9cc6fc6d3..184a4755a3 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -254,6 +254,8 @@ Function .onInit
StrCmp $R0 '2000' lbl_winversion_unsupported_2000
StrCmp $R0 'XP' lbl_winversion_unsupported_xp_2003
StrCmp $R0 '2003' lbl_winversion_unsupported_xp_2003
+ StrCmp $R0 'Vista' lbl_winversion_unsupported_vista_2008
+ StrCmp $R0 '2008' lbl_winversion_unsupported_vista_2008
Goto lbl_winversion_supported
lbl_winversion_unsupported:
@@ -280,6 +282,12 @@ lbl_winversion_unsupported_xp_2003:
/SD IDOK
Quit
+lbl_winversion_unsupported_vista_2008:
+ MessageBox MB_OK \
+ "Windows $R0 is no longer supported.$\nPlease install ${PROGRAM_NAME} 2.2 instead." \
+ /SD IDOK
+ Quit
+
lbl_winversion_supported:
!insertmacro IsWiresharkRunning
diff --git a/packaging/wix/Prerequisites.wxi b/packaging/wix/Prerequisites.wxi
index 6298113907..54e8416a9c 100644
--- a/packaging/wix/Prerequisites.wxi
+++ b/packaging/wix/Prerequisites.wxi
@@ -31,8 +31,12 @@
<![CDATA[Installed OR (VersionNT < 502) OR (VersionNT > 502)]]>
</Condition>
- <Condition Message="$(var.WiresharkName)$(var.WiresharkVersion) is only supported on Windows Vista, Windows Server 2008, or higher.">
- <![CDATA[Installed OR (VersionNT >= 600)]]>
+ <Condition Message="Windows Vista and Server 2008 are no longer supported. Please install $(var.WiresharkName) 2.2 instead.">
+ <![CDATA[Installed OR (VersionNT < 600) OR (VersionNT > 600)]]>
+ </Condition>
+
+ <Condition Message="$(var.WiresharkName)$(var.WiresharkVersion) is only supported on Windows 7, Windows Server 2008R2, or higher.">
+ <![CDATA[Installed OR (VersionNT >= 601)]]>
</Condition>
<!--