chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Add Rainmeter.exe.config to declare support for the .NET 4.0 and 4.5 runtimes

Browse Source 
This allows plugins like InputText.dll to be used with .NET 4.0/4.5 in addition to 2.0. Therefore, we can avoid installing .NET 2.0 on Windows 8 and 8.1 where it is not installed by default (whereas 4.5/4.5.1 is installed by default).
This commit is contained in:
Birunthan Mohanathas 2013-10-18 10:39:32 +03:00
parent 1940b7f97c
commit f6461a1b30
3 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Application/Application.vcxproj
View File

@ -118,6 +118,11 @@ xcopy /Q /S /Y ..\Build\Themes ..\testbench\x64\release\Layouts
<ItemGroup> <ItemGroup>
<ResourceCompile Include="Application.rc" /> <ResourceCompile Include="Application.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Include="Rainmeter.exe.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Rainmeter.ico" /> <None Include="Rainmeter.ico" />
</ItemGroup> </ItemGroup>

9
Application/Rainmeter.exe.config Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup useLegacyV2RuntimeActivationPolicy="true">
<supportedRuntime version="v4.5.1" />
<supportedRuntime version="v4.5" />
<supportedRuntime version="v4.0" />
<supportedRuntime version="v2.0.50727" />
</startup>
</configuration>

45
Build/Installer/Installer.nsi
View File

@ -619,31 +619,33 @@ Section
${EndIf} ${EndIf}
${EndIf} ${EndIf}
; Download and install .NET if required ${IfNot} ${AtLeastWinVista}
ReadRegDWORD $0 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v2.0.50727" "Install" ; Download and install .NET if required
${If} $0 <> 1 ReadRegDWORD $0 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v2.0.50727" "Install"
${If} $Install64Bit <> 1 ${If} $0 <> 1
NSISdl::download /TIMEOUT=30000 "http://download.microsoft.com/download/5/6/7/567758a3-759e-473e-bf8f-52154438565a/dotnetfx.exe" "$PLUGINSDIR\dotnetfx.exe" ${If} $Install64Bit <> 1
${Else} NSISdl::download /TIMEOUT=30000 "http://download.microsoft.com/download/5/6/7/567758a3-759e-473e-bf8f-52154438565a/dotnetfx.exe" "$PLUGINSDIR\dotnetfx.exe"
NSISdl::download /TIMEOUT=30000 "http://download.microsoft.com/download/a/3/f/a3f1bf98-18f3-4036-9b68-8e6de530ce0a/NetFx64.exe" "$PLUGINSDIR\dotnetfx.exe" ${Else}
${EndIf} NSISdl::download /TIMEOUT=30000 "http://download.microsoft.com/download/a/3/f/a3f1bf98-18f3-4036-9b68-8e6de530ce0a/NetFx64.exe" "$PLUGINSDIR\dotnetfx.exe"
Pop $0 ${EndIf}
Pop $0
${If} $0 == "success" ${If} $0 == "success"
ExecWait '"$PLUGINSDIR\dotnetfx.exe" /q:a /c:"install /q"' $0 ExecWait '"$PLUGINSDIR\dotnetfx.exe" /q:a /c:"install /q"' $0
Delete "$PLUGINSDIR\dotnetfx.exe" Delete "$PLUGINSDIR\dotnetfx.exe"
${If} $0 = 3010 ${If} $0 = 3010
SetRebootFlag true SetRebootFlag true
${ElseIf} $0 <> 0 ${ElseIf} $0 <> 0
MessageBox MB_OK|MB_ICONSTOP "$(DOTNETINSTERROR)"
Quit
${EndIf}
${ElseIf} $0 == "cancel"
Quit
${Else}
MessageBox MB_OK|MB_ICONSTOP "$(DOTNETINSTERROR)" MessageBox MB_OK|MB_ICONSTOP "$(DOTNETINSTERROR)"
Quit Quit
${EndIf} ${EndIf}
${ElseIf} $0 == "cancel"
Quit
${Else}
MessageBox MB_OK|MB_ICONSTOP "$(DOTNETINSTERROR)"
Quit
${EndIf} ${EndIf}
${EndIf} ${EndIf}
${EndIf} ${EndIf}
@ -713,7 +715,6 @@ SkipIniMove:
${EndIf} ${EndIf}
; Cleanup old stuff ; Cleanup old stuff
Delete "$INSTDIR\Rainmeter.exe.config"
Delete "$INSTDIR\Rainmeter.chm" Delete "$INSTDIR\Rainmeter.chm"
Delete "$INSTDIR\Default.ini" Delete "$INSTDIR\Default.ini"
Delete "$INSTDIR\Launcher.exe" Delete "$INSTDIR\Launcher.exe"
@ -746,6 +747,7 @@ SkipIniMove:
${Else} ${Else}
!insertmacro InstallFiles "x64" !insertmacro InstallFiles "x64"
${EndIf} ${EndIf}
File "..\..\Application\Rainmeter.exe.config"
RMDir /r "$INSTDIR\Languages" RMDir /r "$INSTDIR\Languages"
SetOutPath "$INSTDIR\Languages" SetOutPath "$INSTDIR\Languages"
@ -991,6 +993,7 @@ Section Uninstall
RMDir /r "$INSTDIR\Fonts" RMDir /r "$INSTDIR\Fonts"
Delete "$INSTDIR\Rainmeter.dll" Delete "$INSTDIR\Rainmeter.dll"
Delete "$INSTDIR\Rainmeter.exe" Delete "$INSTDIR\Rainmeter.exe"
Delete "$INSTDIR\Rainmeter.exe.config"
Delete "$INSTDIR\SkinInstaller.exe" Delete "$INSTDIR\SkinInstaller.exe"
Delete "$INSTDIR\uninst.exe" Delete "$INSTDIR\uninst.exe"