System.Data.SQLite
Check-in [4919dd2ea9]
Not logged in

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

Overview
Comment:Merge updates from trunk.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | sessions
Files: files | file ages | folders
SHA1: 4919dd2ea9e19dd6fdd7a92b776055f1d671f242
User & Date: mistachkin 2017-10-08 22:00:54
Context
2017-10-09
16:09
The delegates used for native callbacks from the SQLite core library must be marked as 'cdecl'. check-in: bad97b09fc user: mistachkin tags: sessions
2017-10-08
22:00
Merge updates from trunk. check-in: 4919dd2ea9 user: mistachkin tags: sessions
21:55
Pickup release archive verification tool changes from upstream. Add NuGet packages in the master release archive manifest. check-in: 68b09a1bbd user: mistachkin tags: trunk
2017-10-07
03:17
Avoid a superfluous call to Marshal.Copy. check-in: cfbbd7b1fe user: mistachkin tags: sessions
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to Setup/data/verify.lst.

1240
1241
1242
1243
1244
1245
1246








































































































































































1247
1248
1249
1250
1251
1252
1253
....
1715
1716
1717
1718
1719
1720
1721
1722
1723




























1724
#
set sds_manifests(setupX64Vs2015) {
  {{tmp}\vcredist_x64_2015_VSU3.exe}
}
 
###############################################################################
#








































































































































































# NOTE: These are the master archive manifest groups, based on file name.  The
#       first element in each list is the array variable name prefix used to
#       locate another array containing the named elements referenced by the
#       remaining elements in each list.  Here is an example:
#
#       1. First, the archive file name has the patch level removed from it.
#          Next, it is mapped to the name of the array containing the file
................................................................................
    setupEf6Bundle setupX86Vs2015]

###############################################################################

set manifests(sqlite-netFx46-setup-bundle-x64-2015-.exe) [list sds \
    setupCore setupBundle setupLinqCore setupEf6Core setupLinqBundle \
    setupEf6Bundle setupX64Vs2015]

###############################################################################




























# end of file







>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>







 









>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>

1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
....
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
#
set sds_manifests(setupX64Vs2015) {
  {{tmp}\vcredist_x64_2015_VSU3.exe}
}
 
###############################################################################
#
# NOTE: This is the list of all files that should be present in all NuGet
#       packages.
#
set sds_manifests(nuGetMetadata) {
  _rels/.rels
  [Content_Types].xml
  package/services/metadata/core-properties/${md5}.psmdcp
}
 
###############################################################################
#
# NOTE: This is the list of all files that should be present in all core
#       NuGet packages that include the primary managed assembly.
#
set sds_manifests(nuGetCoreManaged) {
  lib/net20/System.Data.SQLite.dll
  lib/net20/System.Data.SQLite.xml
  lib/net40/System.Data.SQLite.dll
  lib/net40/System.Data.SQLite.xml
  lib/net45/System.Data.SQLite.dll
  lib/net45/System.Data.SQLite.xml
  lib/net451/System.Data.SQLite.dll
  lib/net451/System.Data.SQLite.xml
  lib/net46/System.Data.SQLite.dll
  lib/net46/System.Data.SQLite.xml
}
 
###############################################################################
#
# NOTE: This is the list of all files that should be present in all core
#       NuGet packages that include the primary interop assemblies.
#
set sds_manifests(nuGetCoreNative) {
  build/net20/x64/SQLite.Interop.dll
  build/net20/x86/SQLite.Interop.dll
  build/net40/x64/SQLite.Interop.dll
  build/net40/x86/SQLite.Interop.dll
  build/net45/x64/SQLite.Interop.dll
  build/net45/x86/SQLite.Interop.dll
  build/net451/x64/SQLite.Interop.dll
  build/net451/x86/SQLite.Interop.dll
  build/net46/x64/SQLite.Interop.dll
  build/net46/x86/SQLite.Interop.dll
  build/net20/System.Data.SQLite.Core.targets
  build/net40/System.Data.SQLite.Core.targets
  build/net45/System.Data.SQLite.Core.targets
  build/net451/System.Data.SQLite.Core.targets
  build/net46/System.Data.SQLite.Core.targets
  lib/net20/System.Data.SQLite.dll.config
  lib/net40/System.Data.SQLite.dll.config
  lib/net45/System.Data.SQLite.dll.config
  lib/net451/System.Data.SQLite.dll.config
  lib/net46/System.Data.SQLite.dll.config
}
 
###############################################################################
#
# NOTE: This is the list of all files that should be present in all NuGet
#       packages that include support for the Entity Framework 6.x.
#
set sds_manifests(nuGetEf6) {
  System.Data.SQLite.EF6.nuspec
  content/net40/app.config.install.xdt
  content/net40/web.config.install.xdt
  content/net40/app.config.transform
  content/net40/web.config.transform
  content/net45/app.config.install.xdt
  content/net45/web.config.install.xdt
  content/net45/app.config.transform
  content/net45/web.config.transform
  content/net451/app.config.install.xdt
  content/net451/web.config.install.xdt
  content/net451/app.config.transform
  content/net451/web.config.transform
  content/net46/app.config.install.xdt
  content/net46/web.config.install.xdt
  content/net46/app.config.transform
  content/net46/web.config.transform
  lib/net40/System.Data.SQLite.EF6.dll
  lib/net45/System.Data.SQLite.EF6.dll
  lib/net451/System.Data.SQLite.EF6.dll
  lib/net46/System.Data.SQLite.EF6.dll
  tools/net40/install.ps1
  tools/net45/install.ps1
  tools/net451/install.ps1
  tools/net46/install.ps1
}
 
###############################################################################
#
# NOTE: This is the list of all files that should be present in all NuGet
#       packages that include support for LINQ.
#
set sds_manifests(nuGetLinq) {
  System.Data.SQLite.Linq.nuspec
  content/net20/app.config.transform
  content/net20/web.config.transform
  content/net40/app.config.transform
  content/net40/web.config.transform
  content/net45/app.config.transform
  content/net45/web.config.transform
  content/net451/app.config.transform
  content/net451/web.config.transform
  content/net46/app.config.transform
  content/net46/web.config.transform
  lib/net20/System.Data.SQLite.Linq.dll
  lib/net40/System.Data.SQLite.Linq.dll
  lib/net45/System.Data.SQLite.Linq.dll
  lib/net451/System.Data.SQLite.Linq.dll
  lib/net46/System.Data.SQLite.Linq.dll
}
 
###############################################################################
#
# NOTE: This is the list of all files that should be present in the primary
#       NuGet package.
#
set sds_manifests(nuGetPrimary) {
  System.Data.SQLite.nuspec
}
 
###############################################################################
#
# NOTE: This is the list of all files that should be present in the core
#       NuGet package.
#
set sds_manifests(nuGetCore) {
  System.Data.SQLite.Core.nuspec
}
 
###############################################################################
#
# NOTE: This is the list of all files that should be present in the core
#       NuGet package that includes only the primary managed assembly.
#
set sds_manifests(nuGetCoreMsil) {
  System.Data.SQLite.Core.MSIL.nuspec
}
 
###############################################################################
#
# NOTE: This is the list of all files that should be present in the NuGet
#       package that includes only the managed assemblies.
#
set sds_manifests(nuGetMsil) {
  System.Data.SQLite.MSIL.nuspec
}
 
###############################################################################
#
# NOTE: This is the list of all files that should be present in the NuGet
#       package that includes the mixed-mode assembly for x64.
#
set sds_manifests(nuGetX64) {
  System.Data.SQLite.x64.nuspec
}
 
###############################################################################
#
# NOTE: This is the list of all files that should be present in the NuGet
#       package that includes the mixed-mode assembly for x86.
#
set sds_manifests(nuGetX86) {
  System.Data.SQLite.x86.nuspec
}
 
###############################################################################
#
# NOTE: These are the master archive manifest groups, based on file name.  The
#       first element in each list is the array variable name prefix used to
#       locate another array containing the named elements referenced by the
#       remaining elements in each list.  Here is an example:
#
#       1. First, the archive file name has the patch level removed from it.
#          Next, it is mapped to the name of the array containing the file
................................................................................
    setupEf6Bundle setupX86Vs2015]

###############################################################################

set manifests(sqlite-netFx46-setup-bundle-x64-2015-.exe) [list sds \
    setupCore setupBundle setupLinqCore setupEf6Core setupLinqBundle \
    setupEf6Bundle setupX64Vs2015]

###############################################################################
############################### NuGet Packages ################################
###############################################################################

set manifests(System.Data.SQLite..nupkg) [list sds \
    nuGetMetadata nuGetPrimary]

set manifests(System.Data.SQLite.Core..nupkg) [list sds \
    nuGetMetadata nuGetCoreManaged nuGetCoreNative nuGetCore]

set manifests(System.Data.SQLite.Core.MSIL..nupkg) [list sds \
    nuGetMetadata nuGetCoreManaged nuGetCoreMsil]

set manifests(System.Data.SQLite.EF6..nupkg) [list sds \
    nuGetMetadata nuGetEf6]

set manifests(System.Data.SQLite.Linq..nupkg) [list sds \
    nuGetMetadata nuGetLinq]

set manifests(System.Data.SQLite.MSIL..nupkg) [list sds \
    nuGetMetadata nuGetMsil]

set manifests(System.Data.SQLite.x64..nupkg) [list sds \
    nuGetMetadata nuGetCoreManaged nuGetX64]

set manifests(System.Data.SQLite.x86..nupkg) [list sds \
    nuGetMetadata nuGetCoreManaged nuGetX86]

###############################################################################
# end of file

Changes to Setup/verify.eagle.

183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
...
208
209
210
211
212
213
214
















215
216
217
218
219
220
221
222
223
224
























225
226
227
228
229
230
231
...
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
...
285
286
287
288
289
290
291
292
293
294

295
296
297
298
299
300
301
302
303
304
305
306












307
308
309
310
311
312
313
      usage "no repository hashes are available"
    }
  }

  set hashPrefix [expr {$failHashes ? "ERROR" : "WARNING"}]
  set archiveFileNames [list]

  foreach extension [list exe rar zip] {
    eval lappend archiveFileNames [findFilesRecursive \
        [file join $directory [appendArgs *. $extension]]]
  }

  foreach archiveFileName $archiveFileNames {
    set manifest [file tail $archiveFileName]

................................................................................
    #
    # HACK: Attempt to match and remove sub-strings from the
    #       manifest file name that look like the name of a
    #       build configuration (e.g. "debug" or "release").
    #
    regsub -- {-debug-|-release-} $manifest {-} manifest

















    #
    # HACK: Attempt to match and remove sub-strings from the
    #       manifest file name that look like a version number
    #       in the format "<major>.<minor>.<build>.<revision>"
    #       and/or a date/time string matching the format
    #       "YYYY-MM-DD-NN" (where the NN portion is a generic
    #       incrementing sequence number).
    #
    regsub -- {\d+\.\d+\.\d+\.\d+} $manifest {} manifest
    regsub -- {\d{4}-\d{2}-\d{2}-\d{2}} $manifest {} manifest

























    if {![info exists manifests($manifest)]} then {
      puts stdout [appendArgs \
          "WARNING: Cannot find master manifest \"" \
          $manifest "\" for archive \"" $archiveFileName \
          "\", skipped."]

................................................................................

    set listCommand [list]
    lappend listCommand exec -success Success -nocarriagereturns --

    set extractCommand [list]
    lappend extractCommand exec -success Success -nocarriagereturns --

    if {[file extension $archiveFileName] eq ".zip"} then {
      if {![file exists $zip]} then {
        usage [appendArgs "tool \"" $zip "\" is missing"]
      }

      lappend listCommand $zip -Z -1 $archiveFileName

      lappend extractCommand $zip -j -o $archiveFileName \
................................................................................
    }

    if {[catch {eval $listCommand} result] == 0} then {
      #
      # HACK: The Inno Setup unpacking tool requires some extra
      #       parsing logic to handle the output.
      #
      if {[string first [file tail $innounp] $listCommand] != -1} then {
        set containedFileNames [list]


        foreach {dummy matchFileName} [regexp -line -all -inline -- \
            {^[ 0-9]{10}  \d{4}\.\d{2}\.\d{2} \d{2}:\d{2}  (.*)$} $result] {
          #
          # NOTE: Add the file name extracted from the output
          #       line to the list of file names contained in
          #       this archive.
          #
          lappend containedFileNames $matchFileName
        }
      } else {
        set containedFileNames [split [string map [list \\ /] \
            [string trim $result]] \n]












      }

      foreach manifestFileName $manifestFileNames {
        #
        # TODO: Should we use -nocase here because Windows
        #       is the primary release platform?
        #







|







 







>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>










>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>







 







|







 







<
|

>










|
|
>
>
>
>
>
>
>
>
>
>
>
>







183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
...
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
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
...
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
...
325
326
327
328
329
330
331

332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
      usage "no repository hashes are available"
    }
  }

  set hashPrefix [expr {$failHashes ? "ERROR" : "WARNING"}]
  set archiveFileNames [list]

  foreach extension [list exe nupkg rar zip] {
    eval lappend archiveFileNames [findFilesRecursive \
        [file join $directory [appendArgs *. $extension]]]
  }

  foreach archiveFileName $archiveFileNames {
    set manifest [file tail $archiveFileName]

................................................................................
    #
    # HACK: Attempt to match and remove sub-strings from the
    #       manifest file name that look like the name of a
    #       build configuration (e.g. "debug" or "release").
    #
    regsub -- {-debug-|-release-} $manifest {-} manifest

    #
    # HACK: Special hack to allow "CLRvX" to appear in the
    #       manifest file names, part 1, the vanishing.
    #
    set manifest [string map \
        [list CLRv2 CLRvTWO CLRv4 CLRvFOUR] $manifest]

    #
    # HACK: Special hack to allow "EF6", "x64", and "x86" to
    #       appear in the manifest file names, part 1, the
    #       vanishing.
    #
    set manifest [string map \
        [list EF6 EF-SIX x64 x-SIXTYFOUR x86 x-EIGHTYSIX] \
        $manifest]

    #
    # HACK: Attempt to match and remove sub-strings from the
    #       manifest file name that look like a version number
    #       in the format "<major>.<minor>.<build>.<revision>"
    #       and/or a date/time string matching the format
    #       "YYYY-MM-DD-NN" (where the NN portion is a generic
    #       incrementing sequence number).
    #
    regsub -- {\d+\.\d+\.\d+\.\d+} $manifest {} manifest
    regsub -- {\d{4}-\d{2}-\d{2}-\d{2}} $manifest {} manifest

    #
    # HACK: Special hack to allow "CLRvX" to appear in the
    #       manifest file names, part 2, the return.
    #
    set manifest [string map \
        [list CLRvTWO CLRv2 CLRvFOUR CLRv4] $manifest]

    #
    # HACK: Special hack to allow "EF6", "x64", and "x86" to
    #       appear in the manifest file names, part 2, the
    #       return.
    #
    set manifest [string map \
        [list EF-SIX EF6 x-SIXTYFOUR x64 x-EIGHTYSIX x86] \
        $manifest]

    #
    # HACK: Fixup manifest file names that correspond to the
    #       NuGet packages for SymbolSource.
    #
    if {[regexp -- {[/\\]SymbolSource[/\\]} $archiveFileName]} then {
      set manifest [string map [list .. .Source..] $manifest]
    }

    if {![info exists manifests($manifest)]} then {
      puts stdout [appendArgs \
          "WARNING: Cannot find master manifest \"" \
          $manifest "\" for archive \"" $archiveFileName \
          "\", skipped."]

................................................................................

    set listCommand [list]
    lappend listCommand exec -success Success -nocarriagereturns --

    set extractCommand [list]
    lappend extractCommand exec -success Success -nocarriagereturns --

    if {[file extension $archiveFileName] in [list .nupkg .zip]} then {
      if {![file exists $zip]} then {
        usage [appendArgs "tool \"" $zip "\" is missing"]
      }

      lappend listCommand $zip -Z -1 $archiveFileName

      lappend extractCommand $zip -j -o $archiveFileName \
................................................................................
    }

    if {[catch {eval $listCommand} result] == 0} then {
      #
      # HACK: The Inno Setup unpacking tool requires some extra
      #       parsing logic to handle the output.
      #

      set containedFileNames [list]

      if {[string first [file tail $innounp] $listCommand] != -1} then {
        foreach {dummy matchFileName} [regexp -line -all -inline -- \
            {^[ 0-9]{10}  \d{4}\.\d{2}\.\d{2} \d{2}:\d{2}  (.*)$} $result] {
          #
          # NOTE: Add the file name extracted from the output
          #       line to the list of file names contained in
          #       this archive.
          #
          lappend containedFileNames $matchFileName
        }
      } else {
        foreach matchFileName [split [string map [list \\ /] [string \
            trim $result]] \n] {
          #
          # NOTE: Replace the dynamically calculated MD5 hash
          #       for the special NuGet package file name, if
          #       needed.
          #
          if {[file extension $matchFileName] eq ".psmdcp"} then {
            regsub -- {/[0-9a-f]{32}\.} $matchFileName {/${md5}.} \
                matchFileName
          }

          lappend containedFileNames $matchFileName
        }
      }

      foreach manifestFileName $manifestFileNames {
        #
        # TODO: Should we use -nocase here because Windows
        #       is the primary release platform?
        #