osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

The Visual C++ 2013 redistributable uses /quiet instead of /q. 

Change-Id: I130b1af814b843638498feaecacc7092bacd3b72
Reviewed-on: https://code.wireshark.org/review/3255
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2014-07-29 18:45:47 -07:00 committed by Gerald Combs
parent 1f08f87735
commit 50c10c0957
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packaging/nsis/wireshark.nsi
View File

@ -358,7 +358,7 @@ File "..\..\ipmap.html"
; C-runtime redistributable
!ifdef VCREDIST_EXE
; vcredist_x86.exe (MSVC V8) - copy and execute the redistributable installer
; vcredist_x64.exe - copy and execute the redistributable installer
File "${VCREDIST_EXE}"
; If the user already has the redistributable installed they will see a
; Big Ugly Dialog by default, asking if they want to uninstall or repair.
@ -367,13 +367,18 @@ File "${VCREDIST_EXE}"
; "silent" install otherwise.
; 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_OLD_FLAGS "1500" VCREDIST_OLD_FLAGS
!ifdef VCREDIST_OLD_FLAGS
!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_OLD_FLAGS
!else ; VCREDIST_FLAGS_Q
!ifdef VCREDIST_FLAGS_Q_NORESTART
StrCpy $VCREDIST_FLAGS "/q /norestart"
!endif ; VCREDIST_OLD_FLAGS
!else ; VCREDIST_FLAGS_Q_NORESTART
StrCpy $VCREDIST_FLAGS "/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"