Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Support using MSBuild v12.0 in the build batch script. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
23e2635c4cdd361fda544d9e08023bb6 |
| User & Date: | mistachkin 2015-04-28 16:42:37 |
Context
|
2015-05-05
| ||
| 22:53 | Update SQLite core library to the latest 3.8.10 pre-release. check-in: ee4b5ffd21 user: mistachkin tags: trunk | |
|
2015-04-28
| ||
| 16:42 | Support using MSBuild v12.0 in the build batch script. check-in: 23e2635c4c user: mistachkin tags: trunk | |
|
2015-04-22
| ||
| 20:50 | Move read-only statement check into the SQLiteStatement.TryGetChanges method to help improve backward compatibility. check-in: 6c5c517163 user: mistachkin tags: trunk | |
Changes
Changes to Setup/build.bat.
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 ... 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 ... 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 |
IF NOT DEFINED CSC ( SET CSC=csc.exe ) %_VECHO% Csc = '%CSC%' IF DEFINED NETFX20ONLY ( %_AECHO% Forcing the use of the .NET Framework 2.0... SET YEAR=2005 CALL :fn_CheckFramework v2.0.50727 GOTO skip_netFxCheck ) IF DEFINED NETFX35ONLY ( %_AECHO% Forcing the use of the .NET Framework 3.5... SET YEAR=2008 CALL :fn_CheckFramework v3.5 GOTO skip_netFxCheck ) IF DEFINED NETFX40ONLY ( %_AECHO% Forcing the use of the .NET Framework 4.0... SET YEAR=2010 CALL :fn_CheckFramework v4.0.30319 GOTO skip_netFxCheck ) IF DEFINED NETFX45ONLY ( %_AECHO% Forcing the use of the .NET Framework 4.5... SET YEAR=2012 CALL :fn_CheckFramework v4.0.30319 GOTO skip_netFxCheck ) IF DEFINED NETFX451ONLY ( %_AECHO% Forcing the use of the .NET Framework 4.5.1... SET YEAR=2013 CALL :fn_CheckFramework v4.0.30319 GOTO skip_netFxCheck ) IF DEFINED FRAMEWORKDIR ( IF NOT EXIST "%FRAMEWORKDIR%" ( CALL :fn_UnsetVariable FRAMEWORKDIR ) ) IF DEFINED FRAMEWORKDIR ( IF NOT EXIST "%FRAMEWORKDIR%\%MSBUILD%" ( CALL :fn_UnsetVariable FRAMEWORKDIR ) IF NOT EXIST "%FRAMEWORKDIR%\%CSC%" ( CALL :fn_UnsetVariable FRAMEWORKDIR ) ) IF NOT DEFINED FRAMEWORKDIR ( %_AECHO% Checking for the .NET Framework 4.0... SET YEAR=2010 CALL :fn_CheckFramework v4.0.30319 ) IF NOT EXIST "%FRAMEWORKDIR%" ( %_AECHO% Checking for the .NET Framework 3.5... SET YEAR=2008 CALL :fn_CheckFramework v3.5 ) IF NOT EXIST "%FRAMEWORKDIR%" ( %_AECHO% Checking for the .NET Framework 2.0... SET YEAR=2005 CALL :fn_CheckFramework v2.0.50727 ) :skip_netFxCheck %_VECHO% Year = '%YEAR%' %_VECHO% FrameworkDir = '%FRAMEWORKDIR%' IF NOT DEFINED FRAMEWORKDIR ( ECHO. ECHO The .NET Framework directory "FRAMEWORKDIR" is not defined. ECHO. ECHO Please install the .NET Framework or set the "FRAMEWORKDIR" ECHO environment variable to the location where it is installed. ECHO. GOTO errors ) IF NOT EXIST "%FRAMEWORKDIR%" ( ECHO. ECHO The .NET Framework directory "%FRAMEWORKDIR%" was not found. ECHO. ECHO Please install the .NET Framework or set the "FRAMEWORKDIR" ECHO environment variable to the location where it is installed. ECHO. GOTO errors ) ................................................................................ %__ECHO2% PUSHD "%ROOT%" IF ERRORLEVEL 1 ( ECHO Could not change directory to "%ROOT%". GOTO errors ) SET PATH=%FRAMEWORKDIR%;%PATH% %_VECHO% Path = '%PATH%' IF NOT DEFINED SOLUTION ( %_AECHO% Building all projects... SET SOLUTION=.\SQLite.NET.%YEAR%.MSBuild.sln ) ................................................................................ IF ERRORLEVEL 1 ( ECHO Could not restore directory. GOTO errors ) GOTO no_errors :fn_CheckFramework SET FRAMEWORKVER=%1 IF NOT DEFINED FRAMEWORKVER GOTO :EOF IF DEFINED NOMSBUILD64 ( %_AECHO% Forced into using 32-bit version of MSBuild... SET FRAMEWORKDIR=%windir%\Microsoft.NET\Framework\%FRAMEWORKVER% GOTO :EOF ) IF NOT "%PROCESSOR_ARCHITECTURE%" == "x86" ( %_AECHO% The operating system appears to be 64-bit. IF EXIST "%windir%\Microsoft.NET\Framework64\%FRAMEWORKVER%" ( IF EXIST "%windir%\Microsoft.NET\Framework64\%FRAMEWORKVER%\%MSBUILD%" ( IF EXIST "%windir%\Microsoft.NET\Framework64\%FRAMEWORKVER%\%CSC%" ( %_AECHO% Using 64-bit version of MSBuild... SET FRAMEWORKDIR=%windir%\Microsoft.NET\Framework64\%FRAMEWORKVER% GOTO :EOF ) ELSE ( %_AECHO% Missing 64-bit version of "%CSC%". ) ) ELSE ( %_AECHO% Missing 64-bit version of "%MSBUILD%". ) ) ELSE ( %_AECHO% Missing 64-bit version of .NET Framework "%FRAMEWORKVER%". ) ) ELSE ( %_AECHO% The operating system appears to be 32-bit. ) %_AECHO% Using 32-bit version of MSBuild... SET FRAMEWORKDIR=%windir%\Microsoft.NET\Framework\%FRAMEWORKVER% GOTO :EOF :fn_UnquoteVariable IF NOT DEFINED %1 GOTO :EOF SETLOCAL SET __ECHO_CMD=ECHO %%%1%% FOR /F "delims=" %%V IN ('%__ECHO_CMD%') DO ( SET VALUE=%%V ) SET VALUE=%VALUE:"=% REM " ENDLOCAL && SET %1=%VALUE% GOTO :EOF :fn_UnsetVariable IF NOT "%1" == "" ( SET %1= CALL :fn_ResetErrorLevel ) GOTO :EOF |
> > > > | | | | | | | | | | > | < | > > > > | | > > > > > > > > | < < < | < > > > > > > > | > < > > | < | | > > > | < | < | | < < < < | > < > > > > > | > > > | < < < < < < < < < < < > | | > > | | > | > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > |
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 ... 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 ... 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 |
IF NOT DEFINED CSC ( SET CSC=csc.exe ) %_VECHO% Csc = '%CSC%' REM REM TODO: When the next version of Visual Studio is released, this section REM may need updating. REM IF DEFINED NETFX20ONLY ( %_AECHO% Forcing the use of the .NET Framework 2.0... SET YEAR=2005 CALL :fn_CheckFrameworkDir v2.0.50727 GOTO setup_buildToolDir ) IF DEFINED NETFX35ONLY ( %_AECHO% Forcing the use of the .NET Framework 3.5... SET YEAR=2008 CALL :fn_CheckFrameworkDir v3.5 GOTO setup_buildToolDir ) IF DEFINED NETFX40ONLY ( %_AECHO% Forcing the use of the .NET Framework 4.0... SET YEAR=2010 CALL :fn_CheckFrameworkDir v4.0.30319 GOTO setup_buildToolDir ) IF DEFINED NETFX45ONLY ( %_AECHO% Forcing the use of the .NET Framework 4.5... SET YEAR=2012 CALL :fn_CheckFrameworkDir v4.0.30319 GOTO setup_buildToolDir ) IF DEFINED NETFX451ONLY ( %_AECHO% Forcing the use of the .NET Framework 4.5.1... SET YEAR=2013 CALL :fn_CheckFrameworkDir v4.0.30319 CALL :fn_CheckMsBuildDir 12.0 GOTO setup_buildToolDir ) IF DEFINED NETFX452ONLY ( %_AECHO% Forcing the use of the .NET Framework 4.5.2... SET YEAR=2013 CALL :fn_CheckFrameworkDir v4.0.30319 CALL :fn_CheckMsBuildDir 12.0 GOTO setup_buildToolDir ) REM REM TODO: When the next version of MSBuild is released, this section may need REM updating. REM IF NOT DEFINED MSBUILDDIR ( CALL :fn_CheckMsBuildDir 12.0 IF DEFINED MSBUILDDIR ( SET YEAR=2013 ) ) REM REM TODO: When the next version of Visual Studio is released, this section REM may need updating. REM IF NOT DEFINED FRAMEWORKDIR ( CALL :fn_CheckFrameworkDir v4.0.30319 IF DEFINED FRAMEWORKDIR ( SET YEAR=2010 ) ) IF NOT DEFINED FRAMEWORKDIR ( CALL :fn_CheckFrameworkDir v3.5 IF DEFINED FRAMEWORKDIR ( SET YEAR=2008 ) ) IF NOT DEFINED FRAMEWORKDIR ( CALL :fn_CheckFrameworkDir v2.0.50727 IF DEFINED FRAMEWORKDIR ( SET YEAR=2005 ) ) :setup_buildToolDir IF DEFINED BUILDTOOLDIR ( %_AECHO% Forcing the use of build tool directory "%BUILDTOOLDIR%"... ) ELSE ( CALL :fn_CheckBuildToolDir CALL :fn_VerifyBuildToolDir ) %_VECHO% Year = '%YEAR%' %_VECHO% FrameworkDir = '%FRAMEWORKDIR%' %_VECHO% MsBuildDir = '%MSBUILDDIR%' %_VECHO% BuildToolDir = '%BUILDTOOLDIR%' IF NOT DEFINED BUILDTOOLDIR ( ECHO. ECHO No directory containing MSBuild could be found. ECHO. ECHO Please install the .NET Framework or set the "FRAMEWORKDIR" ECHO environment variable to the location where it is installed. ECHO. GOTO errors ) ................................................................................ %__ECHO2% PUSHD "%ROOT%" IF ERRORLEVEL 1 ( ECHO Could not change directory to "%ROOT%". GOTO errors ) SET PATH=%BUILDTOOLDIR%;%PATH% %_VECHO% Path = '%PATH%' IF NOT DEFINED SOLUTION ( %_AECHO% Building all projects... SET SOLUTION=.\SQLite.NET.%YEAR%.MSBuild.sln ) ................................................................................ IF ERRORLEVEL 1 ( ECHO Could not restore directory. GOTO errors ) GOTO no_errors :fn_CheckFrameworkDir IF DEFINED NOFRAMEWORKDIR GOTO :EOF SET FRAMEWORKVER=%1 %_AECHO% Checking for .NET Framework "%FRAMEWORKVER%"... IF NOT DEFINED FRAMEWORKVER GOTO :EOF IF DEFINED NOFRAMEWORK64 ( %_AECHO% Forced into using 32-bit version of MSBuild from Microsoft.NET... SET FRAMEWORKDIR=%windir%\Microsoft.NET\Framework\%FRAMEWORKVER% CALL :fn_VerifyFrameworkDir GOTO :EOF ) IF NOT "%PROCESSOR_ARCHITECTURE%" == "x86" ( %_AECHO% The operating system appears to be 64-bit. IF EXIST "%windir%\Microsoft.NET\Framework64\%FRAMEWORKVER%" ( IF EXIST "%windir%\Microsoft.NET\Framework64\%FRAMEWORKVER%\%MSBUILD%" ( IF EXIST "%windir%\Microsoft.NET\Framework64\%FRAMEWORKVER%\%CSC%" ( %_AECHO% Using 64-bit version of MSBuild from Microsoft.NET... SET FRAMEWORKDIR=%windir%\Microsoft.NET\Framework64\%FRAMEWORKVER% CALL :fn_VerifyFrameworkDir GOTO :EOF ) ELSE ( %_AECHO% Missing 64-bit version of "%CSC%". ) ) ELSE ( %_AECHO% Missing 64-bit version of "%MSBUILD%". ) ) ELSE ( %_AECHO% Missing 64-bit version of .NET Framework "%FRAMEWORKVER%". ) ) ELSE ( %_AECHO% The operating system appears to be 32-bit. ) %_AECHO% Using 32-bit version of MSBuild from Microsoft.NET... SET FRAMEWORKDIR=%windir%\Microsoft.NET\Framework\%FRAMEWORKVER% CALL :fn_VerifyFrameworkDir GOTO :EOF :fn_VerifyFrameworkDir IF DEFINED NOFRAMEWORKDIR GOTO :EOF IF NOT DEFINED FRAMEWORKDIR ( %_AECHO% .NET Framework directory is not defined. GOTO :EOF ) IF DEFINED FRAMEWORKDIR IF NOT EXIST "%FRAMEWORKDIR%" ( %_AECHO% .NET Framework directory does not exist, unsetting... CALL :fn_UnsetVariable FRAMEWORKDIR GOTO :EOF ) IF DEFINED FRAMEWORKDIR IF NOT EXIST "%FRAMEWORKDIR%\%MSBUILD%" ( %_AECHO% File "%MSBUILD%" not in .NET Framework directory, unsetting... CALL :fn_UnsetVariable FRAMEWORKDIR GOTO :EOF ) IF DEFINED FRAMEWORKDIR IF NOT EXIST "%FRAMEWORKDIR%\%CSC%" ( %_AECHO% File "%CSC%" not in .NET Framework directory, unsetting... CALL :fn_UnsetVariable FRAMEWORKDIR GOTO :EOF ) %_AECHO% .NET Framework directory "%FRAMEWORKDIR%" verified. GOTO :EOF :fn_CheckMsBuildDir IF DEFINED NOMSBUILDDIR GOTO :EOF SET MSBUILDVER=%1 %_AECHO% Checking for MSBuild "%MSBUILDVER%"... IF NOT DEFINED MSBUILDVER GOTO :EOF IF DEFINED NOMSBUILD64 ( %_AECHO% Forced into using 32-bit version of MSBuild from Program Files... GOTO set_msbuild_x86 ) IF "%PROCESSOR_ARCHITECTURE%" == "x86" GOTO set_msbuild_x86 %_AECHO% The operating system appears to be 64-bit. %_AECHO% Using 32-bit version of MSBuild from Program Files... SET MSBUILDDIR=%ProgramFiles(x86)%\MSBuild\%MSBUILDVER%\bin GOTO set_msbuild_done :set_msbuild_x86 %_AECHO% The operating system appears to be 32-bit. %_AECHO% Using native version of MSBuild from Program Files... SET MSBUILDDIR=%ProgramFiles%\MSBuild\%MSBUILDVER%\bin :set_msbuild_done CALL :fn_VerifyMsBuildDir GOTO :EOF :fn_VerifyMsBuildDir IF DEFINED NOMSBUILDDIR GOTO :EOF IF NOT DEFINED MSBUILDDIR ( %_AECHO% MSBuild directory is not defined. GOTO :EOF ) IF DEFINED MSBUILDDIR IF NOT EXIST "%MSBUILDDIR%" ( %_AECHO% MSBuild directory does not exist, unsetting... CALL :fn_UnsetVariable MSBUILDDIR GOTO :EOF ) IF DEFINED MSBUILDDIR IF NOT EXIST "%MSBUILDDIR%\%MSBUILD%" ( %_AECHO% File "%MSBUILD%" not in MSBuild directory, unsetting... CALL :fn_UnsetVariable MSBUILDDIR GOTO :EOF ) IF DEFINED MSBUILDDIR IF NOT EXIST "%MSBUILDDIR%\%CSC%" ( %_AECHO% File "%CSC%" not in MSBuild directory, unsetting... CALL :fn_UnsetVariable MSBUILDDIR GOTO :EOF ) %_AECHO% MSBuild directory "%MSBUILDDIR%" verified. GOTO :EOF :fn_CheckBuildToolDir %_AECHO% Checking for build tool directories... IF DEFINED MSBUILDDIR GOTO set_msbuild_tools IF DEFINED FRAMEWORKDIR GOTO set_framework_tools %_AECHO% No build tool directories found. GOTO :EOF :set_msbuild_tools %_AECHO% Using MSBuild directory "%MSBUILDDIR%"... CALL :fn_CopyVariable MSBUILDDIR BUILDTOOLDIR GOTO :EOF :set_framework_tools %_AECHO% Using .NET Framework directory "%FRAMEWORKDIR%"... CALL :fn_CopyVariable FRAMEWORKDIR BUILDTOOLDIR GOTO :EOF :fn_VerifyBuildToolDir IF NOT DEFINED BUILDTOOLDIR ( %_AECHO% Build tool directory is not defined. GOTO :EOF ) IF DEFINED BUILDTOOLDIR IF NOT EXIST "%BUILDTOOLDIR%" ( %_AECHO% Build tool directory does not exist, unsetting... CALL :fn_UnsetVariable BUILDTOOLDIR GOTO :EOF ) IF DEFINED BUILDTOOLDIR IF NOT EXIST "%BUILDTOOLDIR%\%MSBUILD%" ( %_AECHO% File "%MSBUILD%" not in build tool directory, unsetting... CALL :fn_UnsetVariable BUILDTOOLDIR GOTO :EOF ) IF DEFINED BUILDTOOLDIR IF NOT EXIST "%BUILDTOOLDIR%\%CSC%" ( %_AECHO% File "%CSC%" not in build tool directory, unsetting... CALL :fn_UnsetVariable BUILDTOOLDIR GOTO :EOF ) %_AECHO% Build tool directory "%BUILDTOOLDIR%" verified. GOTO :EOF :fn_UnquoteVariable IF NOT DEFINED %1 GOTO :EOF SETLOCAL SET __ECHO_CMD=ECHO %%%1%% FOR /F "delims=" %%V IN ('%__ECHO_CMD%') DO ( SET VALUE=%%V ) SET VALUE=%VALUE:"=% REM " ENDLOCAL && SET %1=%VALUE% GOTO :EOF :fn_CopyVariable IF NOT DEFINED %1 GOTO :EOF IF "%2" == "" GOTO :EOF SETLOCAL SET __ECHO_CMD=ECHO %%%1%% FOR /F "delims=" %%V IN ('%__ECHO_CMD%') DO ( SET VALUE=%%V ) ENDLOCAL && SET %2=%VALUE% GOTO :EOF :fn_UnsetVariable IF NOT "%1" == "" ( SET %1= CALL :fn_ResetErrorLevel ) GOTO :EOF |