mirrors/urbackup_frontend_wx
2
0
Fork 0
mirror of https://github.com/uroni/urbackup_frontend_wx.git synced 2025-10-26 11:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Install vc 2019 runtime

Browse Source
This commit is contained in:
Martin 2020-02-12 01:21:37 +01:00
parent ff2b9088a8
commit 6e8f87e1d4
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -92,3 +92,4 @@ translations/urbackup.frontend/en_new.po
*.orig
UrBackupClientGUI.VC.opendb
/.vs/*

2
UrBackupClientGUI.vcxproj
View File

@ -22,7 +22,7 @@
<ProjectGuid>{7169B7EA-2630-4042-A0DC-19471462C1C3}</ProjectGuid>
<RootNamespace>UrBackupClientGUI</RootNamespace>
<Keyword>Win32Proj</Keyword>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

16
urbackup.nsi
View File

@ -93,19 +93,19 @@ Section "install"
; ExecWait '"$TEMP\vcredist_x64.exe" /q'
; Delete '$TEMP\vcredist_x64.exe'
; VSRedistInstalled64:
File "..\deps\redist\vc_redist_2015.x64.exe"
ExecWait '"$TEMP\vc_redist_2015.x64.exe" /q /norestart' $0
File "..\deps\redist\vc_redist_2019.x64.exe"
+ ExecWait '"$TEMP\vc_redist_2019.x64.exe" /q /norestart' $0
${If} $0 != '0'
${If} $0 != '3010'
${If} $0 != '1638'
${If} $0 != '8192'
${If} $0 != '1641'
${If} $0 != '1046'
ExecWait '"$TEMP\vc_redist_2015.x64.exe" /passive /norestart' $0
ExecWait '"$TEMP\vc_redist_2019.x64.exe" /passive /norestart' $0
${If} $0 != '0'
${If} $0 != '3010'
${If} $0 != '1638'
DetailPrint "Unable to install Visual Studio 2015 runtime. Falling back to site local runtime installation."
DetailPrint "Unable to install Visual Studio 2019 runtime. Falling back to site local runtime installation."
StrCpy $SITE_LOCAL_RUNTIME "1"
${EndIf}
${EndIf}
@ -128,19 +128,19 @@ Section "install"
; Delete '$TEMP\vcredist_x86.exe'
; ${EndIf}
; ${EndIf}
File "..\deps\redist\vc_redist_2015.x86.exe"
ExecWait '"$TEMP\vc_redist_2015.x86.exe" /q /norestart' $0
File "..\deps\redist\vc_redist_2019.x86.exe"
+ ExecWait '"$TEMP\vc_redist_2019.x86.exe" /q /norestart' $0
${If} $0 != '0'
${If} $0 != '3010'
${If} $0 != '1638'
${If} $0 != '8192'
${If} $0 != '1641'
${If} $0 != '1046'
ExecWait '"$TEMP\vc_redist_2015.x86.exe" /passive /norestart' $0
ExecWait '"$TEMP\vc_redist_2019.x86.exe" /passive /norestart' $0
${If} $0 != '0'
${If} $0 != '3010'
${If} $0 != '1638'
MessageBox MB_OK "Unable to install Visual Studio 2015 runtime. UrBackup needs that runtime."
MessageBox MB_OK "Unable to install Visual Studio 2019 runtime. UrBackup needs that runtime."
Quit
${EndIf}
${EndIf}

16
urbackup_notray.nsi
View File

@ -90,19 +90,19 @@ Section "install"
; ExecWait '"$TEMP\vcredist_x64.exe" /q'
; Delete '$TEMP\vcredist_x64.exe'
; VSRedistInstalled64:
File "..\deps\redist\vc_redist_2015.x64.exe"
ExecWait '"$TEMP\vc_redist_2015.x64.exe" /q /norestart' $0
File "..\deps\redist\vc_redist_2019.x64.exe"
ExecWait '"$TEMP\vc_redist_2019.x64.exe" /q /norestart' $0
${If} $0 != '0'
${If} $0 != '3010'
${If} $0 != '1638'
${If} $0 != '8192'
${If} $0 != '1641'
${If} $0 != '1046'
ExecWait '"$TEMP\vc_redist_2015.x64.exe" /passive /norestart' $0
ExecWait '"$TEMP\vc_redist_2019.x64.exe" /passive /norestart' $0
${If} $0 != '0'
${If} $0 != '3010'
${If} $0 != '1638'
DetailPrint "Unable to install Visual Studio 2015 runtime. Falling back to site local runtime installation."
DetailPrint "Unable to install Visual Studio 2019 runtime. Falling back to site local runtime installation."
StrCpy $SITE_LOCAL_RUNTIME "1"
${EndIf}
${EndIf}
@ -125,19 +125,19 @@ Section "install"
; Delete '$TEMP\vcredist_x86.exe'
; ${EndIf}
; ${EndIf}
File "..\deps\redist\vc_redist_2015.x86.exe"
ExecWait '"$TEMP\vc_redist_2015.x86.exe" /q /norestart' $0
File "..\deps\redist\vc_redist_2019.x86.exe"
ExecWait '"$TEMP\vc_redist_2019.x86.exe" /q /norestart' $0
${If} $0 != '0'
${If} $0 != '3010'
${If} $0 != '1638'
${If} $0 != '8192'
${If} $0 != '1641'
${If} $0 != '1046'
ExecWait '"$TEMP\vc_redist_2015.x86.exe" /passive /norestart' $0
ExecWait '"$TEMP\vc_redist_2019.x86.exe" /passive /norestart' $0
${If} $0 != '0'
${If} $0 != '3010'
${If} $0 != '1638'
MessageBox MB_OK "Unable to install Visual Studio 2015 runtime. UrBackup needs that runtime."
MessageBox MB_OK "Unable to install Visual Studio 2019 runtime. UrBackup needs that runtime."
Quit
${EndIf}
${EndIf}