diff options
| author | sr55 <[email protected]> | 2012-03-04 21:40:53 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2012-03-04 21:40:53 +0000 |
| commit | 4b41059acd9cb9121069c16a3335ac355f0f2b3e (patch) | |
| tree | ccacaf8041245d56346dd31b879310cb4570adcb | |
| parent | 222283cb8286ed8cf2a04168c72eccea7eb6de75 (diff) | |
WinGui: 0.9.x branch switch installer to use .NET 4 Client Profile.
git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.9.x@4496 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | win/CS/Installer/Installer.nsi | 4 | ||||
| -rw-r--r-- | win/CS/Installer/MakeNightly64.nsi.tmpl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/win/CS/Installer/Installer.nsi b/win/CS/Installer/Installer.nsi index a8d704962..c47170981 100644 --- a/win/CS/Installer/Installer.nsi +++ b/win/CS/Installer/Installer.nsi @@ -103,13 +103,13 @@ Section "Handbrake" SEC01 Call CheckFramework
StrCmp $0 "1" +3
StrCpy $InstallDotNET "Yes"
- MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 4.0 is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK
+ MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 4.0 Client Profile is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK
Pop $0
; Get .NET if required
${If} $InstallDotNET == "Yes"
SetDetailsView hide
- inetc::get /caption "Downloading .NET Framework 4.0" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=41&SrcFamilyId=9CFB2D51-5FF4-4491-B0E5-B386F32C0992&SrcDisplayLang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f1%2fB%2fE%2f1BE39E79-7E39-46A3-96FF-047F95396215%2fdotNetFx40_Full_setup.exe" "$INSTDIR\dotnetfx.exe" /end
+ inetc::get /caption "Downloading .NET Framework 4.0" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=41&srcfamilyid=e5ad0459-cbcc-4b4f-97b6-fb17111cf544&srcdisplaylang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f5%2f6%2f2%2f562A10F9-C9F4-4313-A044-9C94E0A8FAC8%2fdotNetFx40_Client_x86_x64.exe" "$INSTDIR\dotnetfx.exe" /end
Pop $1
${If} $1 != "OK"
diff --git a/win/CS/Installer/MakeNightly64.nsi.tmpl b/win/CS/Installer/MakeNightly64.nsi.tmpl index 056fd36f6..787465936 100644 --- a/win/CS/Installer/MakeNightly64.nsi.tmpl +++ b/win/CS/Installer/MakeNightly64.nsi.tmpl @@ -103,13 +103,13 @@ Section "Handbrake" SEC01 Call CheckFramework
StrCmp $0 "1" +3
StrCpy $InstallDotNET "Yes"
- MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 4.0 is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK
+ MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 4.0 Client Profile is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK
Pop $0
; Get .NET if required
${If} $InstallDotNET == "Yes"
SetDetailsView hide
- inetc::get /caption "Downloading .NET Framework 4.0" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=41&SrcFamilyId=9CFB2D51-5FF4-4491-B0E5-B386F32C0992&SrcDisplayLang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f1%2fB%2fE%2f1BE39E79-7E39-46A3-96FF-047F95396215%2fdotNetFx40_Full_setup.exe" "$INSTDIR\dotnetfx.exe" /end
+ inetc::get /caption "Downloading .NET Framework 4.0" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=41&srcfamilyid=e5ad0459-cbcc-4b4f-97b6-fb17111cf544&srcdisplaylang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f5%2f6%2f2%2f562A10F9-C9F4-4313-A044-9C94E0A8FAC8%2fdotNetFx40_Client_x86_x64.exe" "$INSTDIR\dotnetfx.exe" /end
Pop $1
${If} $1 != "OK"
|