Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Enhance the 'isBuildAvailable' routine in the test suite infrastructure to support architecture names in addition to platform names. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | delegateFunction |
| Files: | files | file ages | folders |
| SHA1: |
e56653e2554bc3114203d72f071dd3d7 |
| User & Date: | mistachkin 2015-08-15 21:57:27 |
Context
|
2015-08-15
| ||
| 22:00 | Merge updates from trunk. check-in: 17781e7b52 user: mistachkin tags: delegateFunction | |
| 21:57 | Enhance the 'isBuildAvailable' routine in the test suite infrastructure to support architecture names in addition to platform names. check-in: e56653e255 user: mistachkin tags: delegateFunction | |
| 17:12 | Merge updates from trunk. check-in: d1fe039ff7 user: mistachkin tags: delegateFunction | |
Changes
Changes to lib/System.Data.SQLite/common.eagle.
509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 ... 538 539 540 541 542 543 544 545 546 547 548 549 550 551 .... 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 .... 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 .... 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 .... 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 |
# NOTE: If the primary assembly also contains the native components,
# we have everything we need.
#
if {$native} then {
return true
}
#
# NOTE: What is the platform for this machine?
#
set platform [machineToPlatform $::tcl_platform(machine)]
#
# NOTE: Build the fully qualified file name for the interop assembly
# containing the System.Data.SQLite native components. If this
# file exists, we should have everything we need.
#
set fileName [file nativename [file join $directory \
$platform SQLite.Interop.dll]]
if {[file exists $fileName]} then {
return true
}
................................................................................
}
#
# NOTE: Build the fully qualified file name for the SQLite core
# library. If this file exists, we should have everything we
# need.
#
set fileName [file nativename [file join $directory \
$platform sqlite3.dll]]
if {[file exists $fileName]} then {
return true
}
................................................................................
# always return zero.
#
return [expr {
[haveConstraint System.Data.SQLite] && [haveConstraint SQLite]
}]
}
proc matchMachine { platform } {
#
# NOTE: An empty string for the platform means that the build is not
# [primarily] a native build; therefore, it always matches.
#
if {[string length $platform] == 0} then {
return true
}
................................................................................
#
if {[isBuildAvailable $native $directory]} then {
#
# NOTE: When in "select" mode, automatically select the first
# available build of System.Data.SQLite and then return
# immediately.
#
if {$select && [matchMachine $platform]} then {
#
# NOTE: Manually override all the build directory selection
# related test settings in order to force this build
# of System.Data.SQLite to be used.
#
if {![changeNativeRuntimeOption $native]} then {
tputs $channel [appendArgs \
................................................................................
$directory "\"... "]
if {[isReleaseAvailable $directory platform]} then {
if {[string length $platform] == 0} then {
set platform unknown
}
if {$select && [matchMachine $platform]} then {
set ::build_directory $directory
tputs $channel [appendArgs "yes, selected (" $platform ")\n"]
return true
} else {
tputs $channel [appendArgs "yes (" $platform ")\n"]
................................................................................
$path "\"... "]
if {[isReleaseAvailable $path platform]} then {
if {[string length $platform] == 0} then {
set platform unknown
}
if {$select && [matchMachine $platform]} then {
set ::build_directory $path
tputs $channel [appendArgs "yes, selected (" $platform ")\n"]
return true
} else {
tputs $channel [appendArgs "yes (" $platform ")\n"]
|
> > > > > > > > > > > > > > > > > > > | | | | |
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 539 540 541 542 543 544 ... 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 .... 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 .... 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 .... 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 .... 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 |
# NOTE: If the primary assembly also contains the native components,
# we have everything we need.
#
if {$native} then {
return true
}
#
# NOTE: What is the architecture for this machine?
#
set architecture [machineToPlatform $::tcl_platform(machine) true]
#
# NOTE: What is the platform for this machine?
#
set platform [machineToPlatform $::tcl_platform(machine)]
#
# NOTE: Build the fully qualified file name for the interop assembly
# containing the System.Data.SQLite native components. If this
# file exists, we should have everything we need.
#
set fileName [file nativename [file join $directory \
$architecture SQLite.Interop.dll]]
if {[file exists $fileName]} then {
return true
}
set fileName [file nativename [file join $directory \
$platform SQLite.Interop.dll]]
if {[file exists $fileName]} then {
return true
}
................................................................................
}
#
# NOTE: Build the fully qualified file name for the SQLite core
# library. If this file exists, we should have everything we
# need.
#
set fileName [file nativename [file join $directory \
$architecture sqlite3.dll]]
if {[file exists $fileName]} then {
return true
}
set fileName [file nativename [file join $directory \
$platform sqlite3.dll]]
if {[file exists $fileName]} then {
return true
}
................................................................................
# always return zero.
#
return [expr {
[haveConstraint System.Data.SQLite] && [haveConstraint SQLite]
}]
}
proc matchPlatform { platform } {
#
# NOTE: An empty string for the platform means that the build is not
# [primarily] a native build; therefore, it always matches.
#
if {[string length $platform] == 0} then {
return true
}
................................................................................
#
if {[isBuildAvailable $native $directory]} then {
#
# NOTE: When in "select" mode, automatically select the first
# available build of System.Data.SQLite and then return
# immediately.
#
if {$select && [matchPlatform $platform]} then {
#
# NOTE: Manually override all the build directory selection
# related test settings in order to force this build
# of System.Data.SQLite to be used.
#
if {![changeNativeRuntimeOption $native]} then {
tputs $channel [appendArgs \
................................................................................
$directory "\"... "]
if {[isReleaseAvailable $directory platform]} then {
if {[string length $platform] == 0} then {
set platform unknown
}
if {$select && [matchPlatform $platform]} then {
set ::build_directory $directory
tputs $channel [appendArgs "yes, selected (" $platform ")\n"]
return true
} else {
tputs $channel [appendArgs "yes (" $platform ")\n"]
................................................................................
$path "\"... "]
if {[isReleaseAvailable $path platform]} then {
if {[string length $platform] == 0} then {
set platform unknown
}
if {$select && [matchPlatform $platform]} then {
set ::build_directory $path
tputs $channel [appendArgs "yes, selected (" $platform ")\n"]
return true
} else {
tputs $channel [appendArgs "yes (" $platform ")\n"]
|