Skip to content

Fix VC Redist filenames in the installer script (VS2019 changes) #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
misch7 merged 1 commit into from
Jun 13, 2020
Merged

Fix VC Redist filenames in the installer script (VS2019 changes) #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

This allows you to easily build the desktop client for 64-bit and 32-bit Windows.

## Update: 2020-06-13

The VC Runtime redistributable filenames have changed in VS 2019.

If you still want to use VS 2017 you may have to change them, see: https://github.com/nextcloud/client-building/pull/28

## Update: 2020-06-11

Upgrades / new default versions:
Expand Down
8 changes: 4 additions & 4 deletions nextcloud.nsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,12 +326,12 @@ FunctionEnd

Function InstallRedistributables
${If} ${RunningX64}
ExecWait '"$OUTDIR\vcredist_x64.exe" /install /quiet /norestart'
ExecWait '"$OUTDIR\vc_redist.x64.exe" /install /quiet /norestart'
${Else}
ExecWait '"$OUTDIR\vcredist_x86.exe" /install /quiet /norestart'
ExecWait '"$OUTDIR\vc_redist.x86.exe" /install /quiet /norestart'
${EndIf}
Delete "$OUTDIR\vcredist_x86.exe"
Delete "$OUTDIR\vcredist_x64.exe"
Delete "$OUTDIR\vc_redist.x86.exe"
Delete "$OUTDIR\vc_redist.x64.exe"
FunctionEnd

##############################################################################
Expand Down