System.Data.SQLite
Check-in [996656054d]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Allow usage of VS 2010 command line build environment when producing managed binaries that require the .NET Framework 2.0.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 996656054d72f468cc2352508f08158f8110531d
User & Date: mistachkin 2011-04-12 19:22:45
Context
2011-04-12
19:55
Change default build configuration back to VS 2008. Please note that, by default, VC++ 2008 Express (or better) is required to use the build.bat tool. check-in: 7856d2e9ff user: mistachkin tags: trunk
19:22
Allow usage of VS 2010 command line build environment when producing managed binaries that require the .NET Framework 2.0. check-in: 996656054d user: mistachkin tags: trunk
18:18
Missed one stray file. check-in: a5c8fdcb81 user: mistachkin tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Setup/build.bat.

   177    177   
   178    178   SET LOGGING="/logger:FileLogger,Microsoft.Build.Engine;Logfile=%LOGDIR%\%LOGPREFIX%_%CONFIGURATION%_%PLATFORM%_%LOGSUFFIX%.log;Verbosity=diagnostic"
   179    179   
   180    180   :skip_setLogging
   181    181   
   182    182   %_VECHO% Logging = '%LOGGING%'
   183    183   
   184         -%_ECHO% MSBuild.exe "%SOLUTION%" "/target:%TARGET%" "/property:Configuration=%CONFIGURATION%" "/property:Platform=%PLATFORM%" %LOGGING%
          184  +%_ECHO% MSBuild.exe "%SOLUTION%" "/target:%TARGET%" "/property:Configuration=%CONFIGURATION%" "/property:Platform=%PLATFORM%" %LOGGING% %MSBUILD_ARGS%
   185    185   
   186    186   IF ERRORLEVEL 1 (
   187    187     ECHO Build failed.
   188    188     GOTO errors
   189    189   )
   190    190   
   191    191   %_ECHO% POPD

Changes to Setup/set_ReleaseNativeOnly.bat.

    10     10   REM
    11     11   REM NOTE: Force usage of the Visual Studio 2008 (.NET Framework 3.5) build
    12     12   REM       system.  This is very important because we want to ship binaries
    13     13   REM       that only rely upon the .NET Framework 2.0 which is very widely
    14     14   REM       deployed and because those binaries will also work with projects
    15     15   REM       using the .NET Framework 4.0.
    16     16   REM
    17         -SET NETFX35ONLY=1
    18         -SET YEAR=2008
           17  +REM SET NETFX35ONLY=1
           18  +SET MSBUILD_ARGS=/property:TargetFrameworkVersion=v3.5
           19  +SET YEAR=2010
    19     20   SET YEARS=%YEAR%
    20     21   
    21     22   ECHO WARNING: Forcing the use of the .NET Framework 3.5...

Changes to Setup/set_common.bat.

     3      3   ::
     4      4   :: set_common.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         -
    11     10   IF NOT DEFINED APPID (
    12     11     SET APPID={{02E43EC2-6B1C-45B5-9E48-941C3E1B204A}
    13     12   )
    14     13   
    15     14   IF NOT DEFINED URL (
    16     15     SET URL=http://system.data.sqlite.org/
    17     16   )
................................................................................
    25     24   )
    26     25   
    27     26   IF NOT DEFINED PROCESSORS (
    28     27     SET PROCESSORS=x86 x64
    29     28   )
    30     29   
    31     30   IF NOT DEFINED YEARS (
    32         -  SET YEARS=2008
           31  +  SET YEARS=2010
    33     32   )

Changes to System.Data.SQLite/System.Data.SQLite.Properties.targets.

    10     10     <!--
    11     11         NOTE: Only use functionality available in the .NET Framework 2.0?  By
    12     12               default, this is disabled.  This must be enabled to successfully
    13     13               build the project using Visual Studio 2008 and/or the .NET
    14     14               Framework 2.0 (if necessary, it will typically be enabled from
    15     15               within the project file itself).
    16     16     -->
    17         -  <PropertyGroup Condition="'$(NetFx20)' != 'false'">
           17  +  <PropertyGroup Condition="'$(NetFx20)' != 'false' Or
           18  +                            '$(TargetFrameworkVersion)' == 'v2.0' Or
           19  +                            '$(TargetFrameworkVersion)' == 'v3.5'">
    18     20       <DefineConstants>$(DefineConstants);NET_20</DefineConstants>
    19     21     </PropertyGroup>
    20     22   
    21     23     <!--
    22     24         NOTE: For interaction with the native SQLite implementation, use the
    23     25               custom build interop DLL (i.e. "SQLite.Interop.DLL")?
    24     26     -->