diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-04-26 09:12:59 -0700 |
|---|---|---|
| committer | Graham Bloice <graham.bloice@trihedral.com> | 2016-04-26 17:15:24 +0000 |
| commit | fc216521850fd5af5bf58ae5e3a90a634d087794 (patch) | |
| tree | 8c1cb10dcb884d8cb5b578267be9408c244200ce /packaging | |
| parent | f26262abe66bf0064b99f0f330d10541df228a78 (diff) | |
NSIS: Pass /install to vcredist_xNN.exe.
Explicitly pass /install to the Visual C++ redistributable installer. A
few people have reported issues with missing or incorrect redistributable
files after installing Wireshark but unfortunately haven't provided
much in the way of further detail. Is it possible that the installer
sometimes goes into /repair, /layout, or /uninstall modes?
Remove checks for old, unsupported compilers while we're here.
Change-Id: I4e24dbe562c8aeb6ce63ec98ea1601cba5256806
Reviewed-on: https://code.wireshark.org/review/15120
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index fbce431d70..48a9484e06 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -391,16 +391,12 @@ File "${VCREDIST_EXE}" ; http://blogs.msdn.com/b/astebner/archive/2010/10/20/10078468.aspx ; http://allthingsconfigmgr.wordpress.com/2013/12/17/visual-c-redistributables-made-simple/ ; "!if ${MSVC_VER_REQUIRED} >= 1600" doesn't work. -!searchparse /noerrors ${MSVC_VER_REQUIRED} "1400" VCREDIST_FLAGS_Q "1500" VCREDIST_FLAGS_Q "1600" VCREDIST_FLAGS_Q_NORESTART -!ifdef VCREDIST_FLAGS_Q -StrCpy $VCREDIST_FLAGS "/q" -!else ; VCREDIST_FLAGS_Q +!searchparse /noerrors ${MSVC_VER_REQUIRED} "1600" VCREDIST_FLAGS_Q_NORESTART !ifdef VCREDIST_FLAGS_Q_NORESTART StrCpy $VCREDIST_FLAGS "/q /norestart" !else ; VCREDIST_FLAGS_Q_NORESTART -StrCpy $VCREDIST_FLAGS "/quiet /norestart" +StrCpy $VCREDIST_FLAGS "/install /quiet /norestart" !endif ; VCREDIST_FLAGS_Q_NORESTART -!endif ; VCREDIST_FLAGS_Q ExecWait '"$INSTDIR\vcredist_${TARGET_MACHINE}.exe" $VCREDIST_FLAGS' $0 DetailPrint "vcredist_${TARGET_MACHINE} returned $0" |