]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge the trunk Makefile enhancements into the reuse-schema branch - especially
authordrh <>
Tue, 22 Aug 2023 15:47:48 +0000 (15:47 +0000)
committerdrh <>
Tue, 22 Aug 2023 15:47:48 +0000 (15:47 +0000)
the new "sdevtset" makefile target.

FossilOrigin-Name: f55f5e9dff16147bc973c31307826eb3692747827d582d05750d2b94b5754c7e

1  2 
Makefile.in
manifest
manifest.uuid

diff --cc Makefile.in
Simple merge
diff --cc manifest
index 50f23f394e3317f1f822430f4b5f6a6bacc7d1ab,9e13232d150f9725838d3368479dca26b4624615..69d1a0cc8dedfbfee7e4ee5320f96f9d5c6355f6
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
- C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sreuse-schema\sbranch.
- D 2023-08-21T17:53:26.231
 -C Add\smakefile\starget\s"sdevtest"\s-\slike\s"mdevtest"\sexcept\sasan\sand\susan\senabled\sfor\sthe\snon-debug\stest.
 -D 2023-08-22T15:19:50.971
++C Merge\sthe\strunk\sMakefile\senhancements\sinto\sthe\sreuse-schema\sbranch\s-\sespecially\nthe\snew\s"sdevtset"\smakefile\starget.
++D 2023-08-22T15:47:48.525
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
- F Makefile.in ad841638a4afe1459b0538a3add7de6f25f431df925d9707456e8b9225aa2a22
 -F Makefile.in 1e9105ffed727b1557ce59f0941c5d271e276ec00bc9823f03d77a89e131b918
++F Makefile.in ea43c8591f7b3799e6774843b8b728cfef63e39f6e18be8efac80fcceefc4c72
  F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
 -F Makefile.msc 26c2d196391a285c279adb10fd6001774d9b243af94b700b681e4a49cd476684
 +F Makefile.msc dc507b7af6d6d82ebdaaa17fd55f33e31d950933aa6e38a8c5d9e2cc1336c2d2
  F README.md 093d7054271141a0a8518558e3d49087cb71f84d33b50ee10053946ed85dcac8
  F VERSION c6366dc72582d3144ce87b013cc35fe48d62f6d07d5be0c9716ea33c862144aa
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -1611,9 -1602,9 +1611,9 @@@ F test/temptable.test d2c9b87a54147161b
  F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d1631311a16
  F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
  F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 -F test/tester.tcl 68454ef88508c196d19e8694daa27bff7107a91857799eaa12f417188ae53ede
 +F test/tester.tcl 9454edbf4df07b8294d15fb9695e8c7dc0b91eb979c3e888e205e7f3cdaf373f
- F test/testrunner.tcl 56a744d4e6e516b2091c2ca6b7b27b9600e9ded136a2c860c350515511ebe20a
- F test/testrunner_data.tcl 8afa4eeec7f7421db3d3af64cdd5544015e887c4289cf871a730cca5a7a8d934
+ F test/testrunner.tcl a9fee4df57276bc9e446961b160068c269da5902cc8ffc3e8852d77626b7594c
+ F test/testrunner_data.tcl c448693eb6fdbadb78cb26f6253d4f335666f9836f988afa575de960b666b19f
  F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
  F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -2102,8 -2092,8 +2102,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P d2b0ddcc75f2dbaabbc81de7a17d082d81162600ee331198cd9808b402721955 f5c50349b1e4da233b554f371be49297b8b40ca5fe0188899ed906f682bf70d6
- R 41c0dee9b7d2d25d12245f3c93d1764b
 -P 055ae724ff34bd41a1d97180b90fce081861856ac67572a633d31f518c20aa1e
 -R 344a2b48243af16d1d58146e802dfb7a
 -U dan
 -Z 0f828f6e2d7bc70d5e26c65d0a7cafbf
++P e94f09f18856881bb6bf135405036b3965abb336a3d4c66615cb698bcd516910 a449d650cd3dcd1baaeb3a3de2aaaac45594397e04f95fe637b0fe4ddb273404
++R 8a40d2de29979d98746558bc41178bbe
 +U drh
- Z f2bfa47c7dcc8ac8734a4d4d79839351
++Z 97af1b5965d036baf8bca4ce61699b3b
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index ebc66e99026ef33da461310fb00037734b4e387b,a832b11fe6c67cab461dcbb028108b6a45f48e46..1fbed43c8e7ee2eb8797d6b86c21b2870f311fed
@@@ -1,1 -1,1 +1,1 @@@
- e94f09f18856881bb6bf135405036b3965abb336a3d4c66615cb698bcd516910
 -a449d650cd3dcd1baaeb3a3de2aaaac45594397e04f95fe637b0fe4ddb273404
++f55f5e9dff16147bc973c31307826eb3692747827d582d05750d2b94b5754c7e