System.Data.SQLite
Check-in [ac588533ce]
Not logged in

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 | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: ac588533ceeb3591544a41d71de8278b7a4f0af3
User & Date: mistachkin 2011-04-09 23:03:18
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
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Setup/CheckForNetFx.pas.

   203    203     NetFx4Version := 'v4.0.30319';
   204    204     NetFx4SetupVersion := 'v4\Full';
   205    205     NetFx4HasServicePack := 'Servicing';
   206    206     NetFx4ServicePack := 0;
   207    207     NetFx4ErrorMessage := 'The Microsoft .NET Framework v4.0 with Service Pack '
   208    208         + IntToStr(NetFx4ServicePack) + ' or higher is required.';
   209    209   
   210         -  VcRuntimeRedistributable := 'vcredist_{#AppProcessor}_{#VcRuntime}_SP1.exe';
          210  +  VcRuntimeRedistributable := 'vcredist_{#AppProcessor}_{#VcRuntime}.exe';
   211    211   
   212    212     if IsNetFx2Setup then
   213    213     begin
   214    214       Result := CheckForNetFx2(NetFx2ServicePack);
   215    215   
   216    216       if not Result then
   217    217       begin

Changes to Setup/SQLite.iss.

    18     18   AppUpdatesURL={#AppURL}
    19     19   AppVerName=System.Data.SQLite v{#AppVersion}
    20     20   AppVersion={#AppVersion}
    21     21   AppComments=The ADO.NET adapter for the SQLite database engine.
    22     22   AppReadmeFile={app}\readme.htm
    23     23   DefaultDirName={pf}\System.Data.SQLite
    24     24   DefaultGroupName=System.Data.SQLite
    25         -OutputBaseFilename=System.Data.SQLite.Setup_{#AppProcessor}_{#VcRuntime}
           25  +OutputBaseFilename=System.Data.SQLite.Setup_{#AppProcessor}_{#Year}
    26     26   SetupLogging=true
    27     27   UninstallFilesDir={app}\uninstall
    28     28   VersionInfoVersion={#AppVersion}
    29     29   ExtraDiskSpaceRequired=2097152
    30     30   
    31     31   [Code]
    32     32   #include "CheckForNetFx.pas"
................................................................................
    60     60   
    61     61   [Dirs]
    62     62   Name: {app}\bin
    63     63   Name: {app}\doc
    64     64   Name: {app}\GAC
    65     65   
    66     66   [Files]
    67         -Components: Application\Core\{#AppProcessor}; Source: ..\Externals\MSVCPP\vcredist_{#AppProcessor}_{#VcRuntime}_SP1.exe; DestDir: {tmp}; Flags: dontcopy
           67  +Components: Application\Core\{#AppProcessor}; Source: ..\Externals\MSVCPP\vcredist_{#AppProcessor}_{#VcRuntime}.exe; DestDir: {tmp}; Flags: dontcopy
    68     68   Components: Application; Source: ..\readme.htm; DestDir: {app}; Flags: restartreplace uninsrestartdelete isreadme
    69     69   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
    70     70   Components: Application\Core\MSIL; Source: ..\bin\Release\bin\System.Data.SQLite.dll; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete
    71     71   Components: Application\Core\MSIL and Application\Symbols; Source: ..\bin\Release\bin\System.Data.SQLite.pdb; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete
    72     72   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
    73     73   Components: Application\LINQ; Source: ..\bin\Release\bin\System.Data.SQLite.Linq.dll; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete
    74     74   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     16   IF NOT DEFINED _CECHO (SET _CECHO=REM)
    17     17   IF NOT DEFINED _VECHO (SET _VECHO=REM)
    18     18   
    19     19   %_AECHO% Running %0 %*
    20     20   
    21     21   SET PATH=%ProgramFiles%\Inno Setup 5;%PATH%
    22     22   
    23         -%_ECHO% ISCC.exe SQLite.iss "/dAppId=%APPID%" "/dAppVersion=%VERSION%" "/dAppPublicKey=%PUBLICKEY%" "/dAppURL=%URL%" "/dIsNetFx2=%ISNETFX2%" "/dVcRuntime=%VCRUNTIME%" "/dAppPlatform=%PLATFORM%" "/dAppProcessor=%PROCESSOR%"
           23  +%_ECHO% ISCC.exe SQLite.iss "/dAppId=%APPID%" "/dAppVersion=%VERSION%" "/dAppPublicKey=%PUBLICKEY%" "/dAppURL=%URL%" "/dIsNetFx2=%ISNETFX2%" "/dVcRuntime=%VCRUNTIME%" "/dAppPlatform=%PLATFORM%" "/dAppProcessor=%PROCESSOR%" "/dYear=%YEAR%"
    24     24   
    25     25   IF %ERRORLEVEL% NEQ 0 (
    26     26     ECHO Failed to compile setup.
    27     27     GOTO errors
    28     28   )
    29     29   
    30     30   GOTO no_errors

Changes to Setup/set_x64_2008.bat.

     4      4   :: set_x64_2008.bat --
     5      5   ::
     6      6   :: Written by Joe Mistachkin.
     7      7   :: Released to the public domain, use at your own risk!
     8      8   ::
     9      9   
    10     10   SET ISNETFX2=True
    11         -SET VCRUNTIME=2008
           11  +SET VCRUNTIME=2008_SP1
    12     12   SET PLATFORM=x64
    13     13   SET PROCESSOR=x64
           14  +SET YEAR=2008

Changes to Setup/set_x64_2010.bat.

     4      4   :: set_x64_2010.bat --
     5      5   ::
     6      6   :: Written by Joe Mistachkin.
     7      7   :: Released to the public domain, use at your own risk!
     8      8   ::
     9      9   
    10     10   SET ISNETFX2=False
    11         -SET VCRUNTIME=2010
           11  +SET VCRUNTIME=2010_SP1
    12     12   SET PLATFORM=x64
    13     13   SET PROCESSOR=x64
           14  +SET YEAR=2010

Changes to Setup/set_x86_2008.bat.

     4      4   :: set_x86_2008.bat --
     5      5   ::
     6      6   :: Written by Joe Mistachkin.
     7      7   :: Released to the public domain, use at your own risk!
     8      8   ::
     9      9   
    10     10   SET ISNETFX2=True
    11         -SET VCRUNTIME=2008
           11  +SET VCRUNTIME=2008_SP1
    12     12   SET PLATFORM=Win32
    13     13   SET PROCESSOR=x86
           14  +SET YEAR=2008

Changes to Setup/set_x86_2010.bat.

     4      4   :: set_x86_2010.bat --
     5      5   ::
     6      6   :: Written by Joe Mistachkin.
     7      7   :: Released to the public domain, use at your own risk!
     8      8   ::
     9      9   
    10     10   SET ISNETFX2=False
    11         -SET VCRUNTIME=2010
           11  +SET VCRUNTIME=2010_SP1
    12     12   SET PLATFORM=Win32
    13     13   SET PROCESSOR=x86
           14  +SET YEAR=2010