Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add check for the .NET Framework 3.5 to prevent the LINQ assembly from being NGen'd when it is not present. Break setup Pascal scripts into #included files. Improve error message for VC runtime install failure. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
c5557a55e679497811e0a1554a535844 |
User & Date: | mistachkin 2011-04-09 22:43:24.223 |
Context
2011-04-09
| ||
23:03 | Remove hard-coded assumption of VC 2008/2010 SP1-level runtimes. check-in: ac588533ce user: mistachkin tags: trunk | |
22:43 | Add check for the .NET Framework 3.5 to prevent the LINQ assembly from being NGen'd when it is not present. Break setup Pascal scripts into #included files. Improve error message for VC runtime install failure. check-in: c5557a55e6 user: mistachkin tags: trunk | |
21:41 | Fail setup if the return code from the VC++ runtime installer is non-zero. check-in: 19bbb66461 user: mistachkin tags: trunk | |
Changes
Added Setup/CheckForNetFx.pas.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 | { CheckForNetFx.iss -- Written by Joe Mistachkin. Released to the public domain, use at your own risk! } var IsNetFx2Setup : Boolean; IsNetFx4Setup : Boolean; NetFxSubKeyName: String; NetFxInstallRoot: String; NetFxSetupSubKeyName: String; NetFxIsInstalled: String; NetFx2Version: String; NetFx2SetupVersion: String; NetFx2HasServicePack: String; NetFx2ServicePack: Integer; NetFx2ErrorMessage: String; NetFx35SetupVersion: String; NetFx35HasServicePack: String; NetFx35ServicePack: Integer; NetFx35ErrorMessage: String; NetFx4Version: String; NetFx4SetupVersion: String; NetFx4HasServicePack: String; NetFx4ServicePack: Integer; NetFx4ErrorMessage: String; VcRuntimeRedistributable: String; function CheckForNetFx2(const NeedServicePack: Integer): Boolean; var SubKeyName: String; IsInstalled: Cardinal; HasServicePack: Cardinal; begin Result := False; SubKeyName := NetFxSetupSubKeyName + '\' + NetFx2SetupVersion; if RegQueryDWordValue(HKEY_LOCAL_MACHINE, SubKeyName, NetFxIsInstalled, IsInstalled) then begin if IsInstalled <> 0 then begin if RegQueryDWordValue(HKEY_LOCAL_MACHINE, SubKeyName, NetFx2HasServicePack, HasServicePack) then begin if HasServicePack >= NeedServicePack then begin Result := True; end; end; end; end; end; function CheckForNetFx35(const NeedServicePack: Integer): Boolean; var SubKeyName: String; IsInstalled: Cardinal; HasServicePack: Cardinal; begin Result := False; SubKeyName := NetFxSetupSubKeyName + '\' + NetFx35SetupVersion; if RegQueryDWordValue(HKEY_LOCAL_MACHINE, SubKeyName, NetFxIsInstalled, IsInstalled) then begin if IsInstalled <> 0 then begin if RegQueryDWordValue(HKEY_LOCAL_MACHINE, SubKeyName, NetFx35HasServicePack, HasServicePack) then begin if HasServicePack >= NeedServicePack then begin Result := True; end; end; end; end; end; function CheckForNetFx4(const NeedServicePack: Integer): Boolean; var SubKeyName: String; IsInstalled: Cardinal; HasServicePack: Cardinal; begin Result := False; SubKeyName := NetFxSetupSubKeyName + '\' + NetFx4SetupVersion; if RegQueryDWordValue(HKEY_LOCAL_MACHINE, SubKeyName, NetFxIsInstalled, IsInstalled) then begin if IsInstalled <> 0 then begin if RegQueryDWordValue(HKEY_LOCAL_MACHINE, SubKeyName, NetFx4HasServicePack, HasServicePack) then begin if HasServicePack >= NeedServicePack then begin Result := True; end; end; end; end; end; function GetNetFx2InstallRoot(const FileName: String): String; var InstallRoot: String; begin Result := ''; if RegQueryStringValue(HKEY_LOCAL_MACHINE, NetFxSubKeyName, NetFxInstallRoot, InstallRoot) then begin Result := InstallRoot + '\' + NetFx2Version; if FileName <> '' then begin Result := Result + '\' + FileName; end; end; end; function GetNetFx4InstallRoot(const FileName: String): String; var InstallRoot: String; begin Result := ''; if RegQueryStringValue(HKEY_LOCAL_MACHINE, NetFxSubKeyName, NetFxInstallRoot, InstallRoot) then begin Result := InstallRoot + '\' + NetFx4Version; if FileName <> '' then begin Result := Result + '\' + FileName; end; end; end; function CheckIsNetFx2Setup(): Boolean; begin Result := IsNetFx2Setup; end; function CheckIsNetFx4Setup(): Boolean; begin Result := IsNetFx4Setup; end; function ExtractAndInstallVcRuntime(var ResultCode: Integer): Boolean; begin ExtractTemporaryFile(VcRuntimeRedistributable); if Exec(ExpandConstant( '{tmp}\' + VcRuntimeRedistributable), '/q', '', SW_SHOW, ewWaitUntilTerminated, ResultCode) then begin Result := True; end else begin Result := False; end; end; function NetFxInitializeSetup(): Boolean; var ResultCode: Integer; begin IsNetFx2Setup := {#IsNetFx2}; IsNetFx4Setup := not IsNetFx2Setup; NetFxSubKeyName := 'Software\Microsoft\.NETFramework'; NetFxInstallRoot := 'InstallRoot'; NetFxSetupSubKeyName := 'Software\Microsoft\NET Framework Setup\NDP'; NetFxIsInstalled := 'Install'; NetFx2Version := 'v2.0.50727'; NetFx2SetupVersion := 'v2.0.50727'; NetFx2HasServicePack := 'SP'; NetFx2ServicePack := 2; NetFx2ErrorMessage := 'The Microsoft .NET Framework v2.0 with Service Pack ' + IntToStr(NetFx2ServicePack) + ' or higher is required.'; NetFx35SetupVersion := 'v3.5'; NetFx35HasServicePack := 'SP'; NetFx35ServicePack := 1; NetFx35ErrorMessage := 'The Microsoft .NET Framework v3.5 with Service Pack ' + IntToStr(NetFx35ServicePack) + ' or higher is required for LINQ support.'; NetFx4Version := 'v4.0.30319'; NetFx4SetupVersion := 'v4\Full'; NetFx4HasServicePack := 'Servicing'; NetFx4ServicePack := 0; NetFx4ErrorMessage := 'The Microsoft .NET Framework v4.0 with Service Pack ' + IntToStr(NetFx4ServicePack) + ' or higher is required.'; VcRuntimeRedistributable := 'vcredist_{#AppProcessor}_{#VcRuntime}_SP1.exe'; if IsNetFx2Setup then begin Result := CheckForNetFx2(NetFx2ServicePack); if not Result then begin MsgBox(NetFx2ErrorMessage, mbError, MB_OK); end; if Result and not CheckForNetFx35(NetFx35ServicePack) then begin MsgBox(NetFx35ErrorMessage, mbInformation, MB_OK); end; end; if IsNetFx4Setup then begin Result := CheckForNetFx4(NetFx4ServicePack); if not Result then begin MsgBox(NetFx4ErrorMessage, mbError, MB_OK); end; end; if Result then begin Result := ExtractAndInstallVcRuntime(ResultCode); if not Result or (ResultCode <> 0) then begin MsgBox('Failed to install Microsoft Visual C++ Runtime: ' + VcRuntimeRedistributable + ', ' + SysErrorMessage(ResultCode), mbError, MB_OK); if Result then begin Result := False; end; end; end; end; |
Added Setup/InitializeSetup.pas.
> > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 | { InitializeSetup.iss -- Written by Joe Mistachkin. Released to the public domain, use at your own risk! } function InitializeSetup(): Boolean; begin Result := NetFxInitializeSetup(); end; |
Changes to Setup/SQLite.iss.
︙ | ︙ | |||
25 26 27 28 29 30 31 | OutputBaseFilename=System.Data.SQLite.Setup_{#AppProcessor}_{#VcRuntime} SetupLogging=true UninstallFilesDir={app}\uninstall VersionInfoVersion={#AppVersion} ExtraDiskSpaceRequired=2097152 [Code] | < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | | | | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 | OutputBaseFilename=System.Data.SQLite.Setup_{#AppProcessor}_{#VcRuntime} SetupLogging=true UninstallFilesDir={app}\uninstall VersionInfoVersion={#AppVersion} ExtraDiskSpaceRequired=2097152 [Code] #include "CheckForNetFx.pas" #include "InitializeSetup.pas" [Components] Name: Application; Description: System.Data.SQLite components.; Types: custom compact full Name: Application\Core; Description: Core components.; Types: custom compact full Name: Application\Core\MSIL; Description: Core managed components.; Types: custom compact full Name: Application\Core\{#AppProcessor}; Description: Core native components.; Types: custom compact full Name: Application\LINQ; Description: LINQ support components.; Types: custom compact full Name: Application\Symbols; Description: Debugging symbol components.; Types: custom compact full Name: Application\Documentation; Description: Documentation components.; Types: custom compact full Name: Application\Test; Description: Test components.; Types: custom compact full [Tasks] Components: Application\Core\MSIL Or Application\LINQ; Name: GAC; Description: Install the assemblies into the global assembly cache.; Flags: unchecked; Check: CheckIsNetFx2Setup() or CheckIsNetFx4Setup() Components: Application\Core\MSIL Or Application\LINQ; Name: NGEN; Description: Generate native images for the assemblies and install the images in the native image cache.; Check: CheckIsNetFx2Setup() or CheckIsNetFx4Setup() [Run] Components: Application\Core\MSIL; Tasks: NGEN; Filename: {code:GetNetFx2InstallRoot|Ngen.exe}; Parameters: "install ""{app}\bin\System.Data.SQLite.dll"" /nologo"; Flags: skipifdoesntexist; Check: CheckIsNetFx2Setup() Components: Application\Core\MSIL; Tasks: NGEN; Filename: {code:GetNetFx4InstallRoot|Ngen.exe}; Parameters: "install ""{app}\bin\System.Data.SQLite.dll"" /nologo"; Flags: skipifdoesntexist; Check: CheckIsNetFx4Setup() Components: Application\LINQ; Tasks: NGEN; Filename: {code:GetNetFx2InstallRoot|Ngen.exe}; Parameters: "install ""{app}\bin\System.Data.SQLite.Linq.dll"" /nologo"; Flags: skipifdoesntexist; Check: CheckIsNetFx2Setup() and CheckForNetFx35(1) Components: Application\LINQ; Tasks: NGEN; Filename: {code:GetNetFx4InstallRoot|Ngen.exe}; Parameters: "install ""{app}\bin\System.Data.SQLite.Linq.dll"" /nologo"; Flags: skipifdoesntexist; Check: CheckIsNetFx4Setup() [UninstallRun] Components: Application\LINQ; Tasks: NGEN; Filename: {code:GetNetFx4InstallRoot|Ngen.exe}; Parameters: "uninstall ""{app}\bin\System.Data.SQLite.Linq.dll"" /nologo"; Flags: skipifdoesntexist; Check: CheckIsNetFx4Setup() Components: Application\LINQ; Tasks: NGEN; Filename: {code:GetNetFx2InstallRoot|Ngen.exe}; Parameters: "uninstall ""{app}\bin\System.Data.SQLite.Linq.dll"" /nologo"; Flags: skipifdoesntexist; Check: CheckIsNetFx2Setup() and CheckForNetFx35(1) Components: Application\Core\MSIL; Tasks: NGEN; Filename: {code:GetNetFx4InstallRoot|Ngen.exe}; Parameters: "uninstall ""{app}\bin\System.Data.SQLite.dll"" /nologo"; Flags: skipifdoesntexist; Check: CheckIsNetFx4Setup() Components: Application\Core\MSIL; Tasks: NGEN; Filename: {code:GetNetFx2InstallRoot|Ngen.exe}; Parameters: "uninstall ""{app}\bin\System.Data.SQLite.dll"" /nologo"; Flags: skipifdoesntexist; Check: CheckIsNetFx2Setup() [Dirs] Name: {app}\bin Name: {app}\doc Name: {app}\GAC [Files] |
︙ | ︙ |