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

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: e56653e2554bc3114203d72f071dd3d7dc95f6ab
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
Hide Diffs Side-by-Side Diffs Show Whitespace Changes Patch

Changes to lib/System.Data.SQLite/common.eagle.

   509    509         # NOTE: If the primary assembly also contains the native components,
   510    510         #       we have everything we need.
   511    511         #
   512    512         if {$native} then {
   513    513           return true
   514    514         }
   515    515   
          516  +      #
          517  +      # NOTE: What is the architecture for this machine?
          518  +      #
          519  +      set architecture [machineToPlatform $::tcl_platform(machine) true]
          520  +
   516    521         #
   517    522         # NOTE: What is the platform for this machine?
   518    523         #
   519    524         set platform [machineToPlatform $::tcl_platform(machine)]
   520    525   
   521    526         #
   522    527         # NOTE: Build the fully qualified file name for the interop assembly
   523    528         #       containing the System.Data.SQLite native components.  If this
   524    529         #       file exists, we should have everything we need.
   525    530         #
          531  +      set fileName [file nativename [file join $directory \
          532  +          $architecture SQLite.Interop.dll]]
          533  +
          534  +      if {[file exists $fileName]} then {
          535  +        return true
          536  +      }
          537  +
   526    538         set fileName [file nativename [file join $directory \
   527    539             $platform SQLite.Interop.dll]]
   528    540   
   529    541         if {[file exists $fileName]} then {
   530    542           return true
   531    543         }
   532    544   
................................................................................
   538    550         }
   539    551   
   540    552         #
   541    553         # NOTE: Build the fully qualified file name for the SQLite core
   542    554         #       library.  If this file exists, we should have everything we
   543    555         #       need.
   544    556         #
          557  +      set fileName [file nativename [file join $directory \
          558  +          $architecture sqlite3.dll]]
          559  +
          560  +      if {[file exists $fileName]} then {
          561  +        return true
          562  +      }
          563  +
   545    564         set fileName [file nativename [file join $directory \
   546    565             $platform sqlite3.dll]]
   547    566   
   548    567         if {[file exists $fileName]} then {
   549    568           return true
   550    569         }
   551    570   
................................................................................
  1197   1216         #       always return zero.
  1198   1217         #
  1199   1218         return [expr {
  1200   1219           [haveConstraint System.Data.SQLite] && [haveConstraint SQLite]
  1201   1220         }]
  1202   1221       }
  1203   1222   
  1204         -    proc matchMachine { platform } {
         1223  +    proc matchPlatform { platform } {
  1205   1224         #
  1206   1225         # NOTE: An empty string for the platform means that the build is not
  1207   1226         #       [primarily] a native build; therefore, it always matches.
  1208   1227         #
  1209   1228         if {[string length $platform] == 0} then {
  1210   1229           return true
  1211   1230         }
................................................................................
  1325   1344               #
  1326   1345               if {[isBuildAvailable $native $directory]} then {
  1327   1346                 #
  1328   1347                 # NOTE: When in "select" mode, automatically select the first
  1329   1348                 #       available build of System.Data.SQLite and then return
  1330   1349                 #       immediately.
  1331   1350                 #
  1332         -              if {$select && [matchMachine $platform]} then {
         1351  +              if {$select && [matchPlatform $platform]} then {
  1333   1352                   #
  1334   1353                   # NOTE: Manually override all the build directory selection
  1335   1354                   #       related test settings in order to force this build
  1336   1355                   #       of System.Data.SQLite to be used.
  1337   1356                   #
  1338   1357                   if {![changeNativeRuntimeOption $native]} then {
  1339   1358                     tputs $channel [appendArgs \
................................................................................
  1386   1405               $directory "\"... "]
  1387   1406   
  1388   1407           if {[isReleaseAvailable $directory platform]} then {
  1389   1408             if {[string length $platform] == 0} then {
  1390   1409               set platform unknown
  1391   1410             }
  1392   1411   
  1393         -          if {$select && [matchMachine $platform]} then {
         1412  +          if {$select && [matchPlatform $platform]} then {
  1394   1413               set ::build_directory $directory
  1395   1414   
  1396   1415               tputs $channel [appendArgs "yes, selected (" $platform ")\n"]
  1397   1416   
  1398   1417               return true
  1399   1418             } else {
  1400   1419               tputs $channel [appendArgs "yes (" $platform ")\n"]
................................................................................
  1409   1428                     $path "\"... "]
  1410   1429   
  1411   1430                 if {[isReleaseAvailable $path platform]} then {
  1412   1431                   if {[string length $platform] == 0} then {
  1413   1432                     set platform unknown
  1414   1433                   }
  1415   1434   
  1416         -                if {$select && [matchMachine $platform]} then {
         1435  +                if {$select && [matchPlatform $platform]} then {
  1417   1436                     set ::build_directory $path
  1418   1437   
  1419   1438                     tputs $channel [appendArgs "yes, selected (" $platform ")\n"]
  1420   1439   
  1421   1440                     return true
  1422   1441                   } else {
  1423   1442                     tputs $channel [appendArgs "yes (" $platform ")\n"]