Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Remove hard-coded assumption of VC 2008/2010 SP1-level runtimes. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
ac588533ceeb3591544a41d71de8278b |
User & Date: | mistachkin 2011-04-09 23:03:18.818 |
Context
2011-04-09
| ||
23:06 | Add missing diagnostic message for the PATH variable. check-in: f43bb46d45 user: mistachkin tags: trunk | |
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 | |
Changes
Changes to Setup/CheckForNetFx.pas.
︙ | ︙ | |||
203 204 205 206 207 208 209 | 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.'; | | | 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 | 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}.exe'; if IsNetFx2Setup then begin Result := CheckForNetFx2(NetFx2ServicePack); if not Result then begin |
︙ | ︙ |
Changes to Setup/SQLite.iss.
︙ | ︙ | |||
18 19 20 21 22 23 24 | AppUpdatesURL={#AppURL} AppVerName=System.Data.SQLite v{#AppVersion} AppVersion={#AppVersion} AppComments=The ADO.NET adapter for the SQLite database engine. AppReadmeFile={app}\readme.htm DefaultDirName={pf}\System.Data.SQLite DefaultGroupName=System.Data.SQLite | | | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | AppUpdatesURL={#AppURL} AppVerName=System.Data.SQLite v{#AppVersion} AppVersion={#AppVersion} AppComments=The ADO.NET adapter for the SQLite database engine. AppReadmeFile={app}\readme.htm DefaultDirName={pf}\System.Data.SQLite DefaultGroupName=System.Data.SQLite OutputBaseFilename=System.Data.SQLite.Setup_{#AppProcessor}_{#Year} SetupLogging=true UninstallFilesDir={app}\uninstall VersionInfoVersion={#AppVersion} ExtraDiskSpaceRequired=2097152 [Code] #include "CheckForNetFx.pas" |
︙ | ︙ | |||
60 61 62 63 64 65 66 | [Dirs] Name: {app}\bin Name: {app}\doc Name: {app}\GAC [Files] | | | 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 | [Dirs] Name: {app}\bin Name: {app}\doc Name: {app}\GAC [Files] Components: Application\Core\{#AppProcessor}; Source: ..\Externals\MSVCPP\vcredist_{#AppProcessor}_{#VcRuntime}.exe; DestDir: {tmp}; Flags: dontcopy Components: Application; Source: ..\readme.htm; DestDir: {app}; Flags: restartreplace uninsrestartdelete isreadme Components: Application\Core\MSIL; Tasks: GAC; Source: ..\bin\Release\bin\System.Data.SQLite.dll; DestDir: {app}\GAC; StrongAssemblyName: "System.Data.SQLite, Version={#AppVersion}, Culture=neutral, PublicKeyToken={#AppPublicKey}, ProcessorArchitecture=MSIL"; Flags: restartreplace uninsrestartdelete uninsnosharedfileprompt sharedfile gacinstall Components: Application\Core\MSIL; Source: ..\bin\Release\bin\System.Data.SQLite.dll; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete Components: Application\Core\MSIL and Application\Symbols; Source: ..\bin\Release\bin\System.Data.SQLite.pdb; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete Components: Application\LINQ; Tasks: GAC; Source: ..\bin\Release\bin\System.Data.SQLite.Linq.dll; DestDir: {app}\GAC; StrongAssemblyName: "System.Data.SQLite.Linq, Version={#AppVersion}, Culture=neutral, PublicKeyToken={#AppPublicKey}, ProcessorArchitecture=MSIL"; Flags: restartreplace uninsrestartdelete uninsnosharedfileprompt sharedfile gacinstall Components: Application\LINQ; Source: ..\bin\Release\bin\System.Data.SQLite.Linq.dll; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete Components: Application\LINQ and Application\Symbols; Source: ..\bin\Release\bin\System.Data.SQLite.Linq.pdb; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete |
︙ | ︙ |
Changes to Setup/bake.bat.
︙ | ︙ | |||
16 17 18 19 20 21 22 | IF NOT DEFINED _CECHO (SET _CECHO=REM) IF NOT DEFINED _VECHO (SET _VECHO=REM) %_AECHO% Running %0 %* SET PATH=%ProgramFiles%\Inno Setup 5;%PATH% | | | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | IF NOT DEFINED _CECHO (SET _CECHO=REM) IF NOT DEFINED _VECHO (SET _VECHO=REM) %_AECHO% Running %0 %* SET PATH=%ProgramFiles%\Inno Setup 5;%PATH% %_ECHO% ISCC.exe SQLite.iss "/dAppId=%APPID%" "/dAppVersion=%VERSION%" "/dAppPublicKey=%PUBLICKEY%" "/dAppURL=%URL%" "/dIsNetFx2=%ISNETFX2%" "/dVcRuntime=%VCRUNTIME%" "/dAppPlatform=%PLATFORM%" "/dAppProcessor=%PROCESSOR%" "/dYear=%YEAR%" IF %ERRORLEVEL% NEQ 0 ( ECHO Failed to compile setup. GOTO errors ) GOTO no_errors |
︙ | ︙ |
Changes to Setup/set_x64_2008.bat.
1 2 3 4 5 6 7 8 9 10 | @ECHO OFF :: :: set_x64_2008.bat -- :: :: Written by Joe Mistachkin. :: Released to the public domain, use at your own risk! :: SET ISNETFX2=True | | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | @ECHO OFF :: :: set_x64_2008.bat -- :: :: Written by Joe Mistachkin. :: Released to the public domain, use at your own risk! :: SET ISNETFX2=True SET VCRUNTIME=2008_SP1 SET PLATFORM=x64 SET PROCESSOR=x64 SET YEAR=2008 |
Changes to Setup/set_x64_2010.bat.
1 2 3 4 5 6 7 8 9 10 | @ECHO OFF :: :: set_x64_2010.bat -- :: :: Written by Joe Mistachkin. :: Released to the public domain, use at your own risk! :: SET ISNETFX2=False | | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | @ECHO OFF :: :: set_x64_2010.bat -- :: :: Written by Joe Mistachkin. :: Released to the public domain, use at your own risk! :: SET ISNETFX2=False SET VCRUNTIME=2010_SP1 SET PLATFORM=x64 SET PROCESSOR=x64 SET YEAR=2010 |
Changes to Setup/set_x86_2008.bat.
1 2 3 4 5 6 7 8 9 10 | @ECHO OFF :: :: set_x86_2008.bat -- :: :: Written by Joe Mistachkin. :: Released to the public domain, use at your own risk! :: SET ISNETFX2=True | | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | @ECHO OFF :: :: set_x86_2008.bat -- :: :: Written by Joe Mistachkin. :: Released to the public domain, use at your own risk! :: SET ISNETFX2=True SET VCRUNTIME=2008_SP1 SET PLATFORM=Win32 SET PROCESSOR=x86 SET YEAR=2008 |
Changes to Setup/set_x86_2010.bat.
1 2 3 4 5 6 7 8 9 10 | @ECHO OFF :: :: set_x86_2010.bat -- :: :: Written by Joe Mistachkin. :: Released to the public domain, use at your own risk! :: SET ISNETFX2=False | | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | @ECHO OFF :: :: set_x86_2010.bat -- :: :: Written by Joe Mistachkin. :: Released to the public domain, use at your own risk! :: SET ISNETFX2=False SET VCRUNTIME=2010_SP1 SET PLATFORM=Win32 SET PROCESSOR=x86 SET YEAR=2010 |