Commit 082a2589 authored by Andreas Traczyk's avatar Andreas Traczyk
Browse files

packaging: detect vc_redist and prevent reinstallation

Change-Id: I149d58da06d6ab2ae8ea712da9a39374ac921cf1
parent f764efa3
...@@ -196,15 +196,16 @@ section "install" ...@@ -196,15 +196,16 @@ section "install"
WriteRegStr HKCR "ring" "URL Protocol" "$\"$\"" WriteRegStr HKCR "ring" "URL Protocol" "$\"$\""
WriteRegStr HKCR "ring\DefaultIcon" "" "$\"$INSTDIR\Jami.exe,1$\"" WriteRegStr HKCR "ring\DefaultIcon" "" "$\"$INSTDIR\Jami.exe,1$\""
WriteRegStr HKCR "ring\shell\open\command" "" "$\"$INSTDIR\Jami.exe$\" $\"%1$\"" WriteRegStr HKCR "ring\shell\open\command" "" "$\"$INSTDIR\Jami.exe$\" $\"%1$\""
# vcredist install (the check would work if uninstalling would remove the REG key) # vcredist install (this check may not work if the vc_redist is uninstalled by the user as
#{If} ${RunningX64} # uninstallation does not remove the REG key
# ReadRegStr $1 HKLM "SOFTWARE\WOW6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x64" "Bld" {If} ${RunningX64}
# StrCmp $1 27012 vcredist_installed ReadRegStr $1 HKLM "SOFTWARE\WOW6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x64" "Bld"
#${Else} StrCmp $1 27012 vcredist_installed
# ReadRegStr $1 HKLM "SOFTWARE\WOW6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Bld" ${Else}
# StrCmp $1 27012 vcredist_installed ReadRegStr $1 HKLM "SOFTWARE\WOW6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Bld"
#${EndIf} StrCmp $1 27012 vcredist_installed
ExecWait "vc_redist.x64.exe /install /passive /norestart" ${EndIf}
ExecWait "vc_redist.x64.exe /install /norestart"
#vcredist_installed: #vcredist_installed:
sectionEnd sectionEnd
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment