Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | More precise handling of slashes in the file names constructed during the setup. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
ac94d2bde1a59d2d1087d4c3784a31a2 |
User & Date: | mistachkin 2013-03-11 01:48:31.283 |
Context
2013-03-13
| ||
02:59 | Update SQLite core library to the latest 3.7.16 pre-release code. check-in: 9a64daea7c user: mistachkin tags: trunk | |
2013-03-11
| ||
01:48 | More precise handling of slashes in the file names constructed during the setup. check-in: ac94d2bde1 user: mistachkin tags: trunk | |
2013-03-07
| ||
03:07 | Update SQLite core library to the latest trunk code. check-in: 32e2b40ffe user: mistachkin tags: trunk | |
Changes
Changes to Setup/CheckForNetFx.pas.
︙ | ︙ | |||
28 29 30 31 32 33 34 35 36 37 38 39 40 41 | 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 | > > > > > > > > > > > > > > > > > | 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 | NetFx4Version: String; NetFx4SetupVersion: String; NetFx4HasServicePack: String; NetFx4ServicePack: Integer; NetFx4ErrorMessage: String; VcRuntimeRedistributable: String; function TrimSlash(const Path: String): String; var LastCharacter: String; begin Result := Path; if Result <> '' then begin LastCharacter := Copy(Result, Length(Result), 1); if (LastCharacter = '\') or (LastCharacter = '/') then begin Result := Copy(Result, 1, Length(Result) - 1); end; end; end; function CheckForNetFx2(const NeedServicePack: Integer): Boolean; var SubKeyName: String; IsInstalled: Cardinal; HasServicePack: Cardinal; begin |
︙ | ︙ | |||
119 120 121 122 123 124 125 | InstallRoot: String; begin Result := ''; if RegQueryStringValue(HKEY_LOCAL_MACHINE, NetFxSubKeyName, NetFxInstallRoot, InstallRoot) then begin | > > | | | | > > > | | | | > | 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 | InstallRoot: String; begin Result := ''; if RegQueryStringValue(HKEY_LOCAL_MACHINE, NetFxSubKeyName, NetFxInstallRoot, InstallRoot) then begin if InstallRoot <> '' then begin Result := TrimSlash(InstallRoot) + '\' + NetFx2Version; if FileName <> '' then begin Result := TrimSlash(Result) + '\' + FileName; end; end; end; end; function GetNetFx4InstallRoot(const FileName: String): String; var InstallRoot: String; begin Result := ''; if RegQueryStringValue(HKEY_LOCAL_MACHINE, NetFxSubKeyName, NetFxInstallRoot, InstallRoot) then begin if InstallRoot <> '' then begin Result := TrimSlash(InstallRoot) + '\' + NetFx4Version; if FileName <> '' then begin Result := TrimSlash(Result) + '\' + FileName; end; end; end; end; function CheckIsNetFx2Setup(): Boolean; begin Result := IsNetFx2Setup; |
︙ | ︙ |