Commit 46fd3697 authored by Andreas Traczyk's avatar Andreas Traczyk
Browse files

nsis: add icon to installer

Change-Id: I9f39e4f1c2f940637724fc308261677f81e8995c
parent 89b81816
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
!include "MUI2.nsh" !include "MUI2.nsh"
!define MUI_ICON "jami.ico"
!define MUI_WELCOMEPAGE !define MUI_WELCOMEPAGE
!define MUI_LICENSEPAGE !define MUI_LICENSEPAGE
!define MUI_DIRECTORYPAGE !define MUI_DIRECTORYPAGE
...@@ -196,17 +197,10 @@ section "install" ...@@ -196,17 +197,10 @@ 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 (this check may not work if the vc_redist is uninstalled by the user as
# uninstallation does not remove the REG key # force vc_redist for now
${If} ${RunningX64}
ReadRegStr $1 HKLM "SOFTWARE\WOW6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x64" "Bld"
StrCmp $1 27012 vcredist_installed
${Else}
ReadRegStr $1 HKLM "SOFTWARE\WOW6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Bld"
StrCmp $1 27012 vcredist_installed
${EndIf}
ExecWait "vc_redist.x64.exe /install /norestart" ExecWait "vc_redist.x64.exe /install /norestart"
vcredist_installed: delete "vc_redist.x64.exe"
sectionEnd sectionEnd
# Uninstaller # Uninstaller
...@@ -246,6 +240,7 @@ section "uninstall" ...@@ -246,6 +240,7 @@ section "uninstall"
rmDir "$SMPROGRAMS\${COMPANYNAME}" rmDir "$SMPROGRAMS\${COMPANYNAME}"
# Remove files # Remove files
delete $INSTDIR\vc_redist.x64.exe
delete $INSTDIR\Jami.exe delete $INSTDIR\Jami.exe
delete $INSTDIR\jami.ico delete $INSTDIR\jami.ico
delete $INSTDIR\*.dll delete $INSTDIR\*.dll
......
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