]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Update Makefile.in to include new target "sqlite3r.c". For generating "sqlite3r.c...
authordan <Dan Kennedy>
Wed, 23 Nov 2022 16:08:49 +0000 (16:08 +0000)
committerdan <Dan Kennedy>
Wed, 23 Nov 2022 16:08:49 +0000 (16:08 +0000)
FossilOrigin-Name: 5f135575b923cb59947667071c6af9ff14063c933cedf37d6c2a0a1b86c85032

1  2 
manifest
manifest.uuid
src/shell.c.in

diff --cc manifest
index eab1abce2e6ddcaa6554ca4cb30266fbb4ec3b5a,b6d1cb051390827725439e856fba3cf6156e876f..3ecb2811092e476d766594cf78fe18cc13eeeb8a
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Remove\sa\sbit\sof\sover-cleverness\swhich\sbreaks\sloading\sof\ssqlite3.js\sin\ssome\smain-thread\scases.
- D 2022-11-23T15:52:52.817
 -C Add\sMakefile.in\stargets\sfor\ssqlite3r.c\sand\ssqlite3r.h,\sversions\sof\sthe\samalgamation\sthat\sinclude\sthe\srecover\sextension.
 -D 2022-11-22T16:12:53.393
++C Update\sMakefile.in\sto\sinclude\snew\starget\s"sqlite3r.c".\sFor\sgenerating\s"sqlite3r.c"\sand\s"sqlite3r.h",\sversions\sof\sthe\samalgamation\sthat\sinclude\sthe\srecover\sextension.\sTo\sbuild\sthe\sshell\stool\sagainst\sthese\sfiles,\sadd\s-DSQLITE_HAVE_SQLITE3R.
++D 2022-11-23T16:08:49.765
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -641,8 -641,8 +641,8 @@@ F src/printf.c e99ee9741e79ae3873458146
  F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
  F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 -F src/select.c 9886d6669f5787471aab6ae52af76fad90b53edb1c218fc9ed9d953363bc5184
 -F src/shell.c.in 947c5714ae9b15a41bc69421ed33f642ed438d09536d0eeecd8964cc05d740ce
 +F src/select.c 4c48373abb4e67129c36bc15d1f5a99a0dfd9534afeb539a2169a09ae91ccec9
- F src/shell.c.in 7d1705f139e6762e8c0fe254a8ebf3ab77aec6d8366f033cdd5f5ebadefbbb20
++F src/shell.c.in 09cb15d7421c475f2d308f6a4312d8d690916ea5cb62ea1618f2f4ce5703af35
  F src/sqlite.h.in 100fc660c2f19961b8ed8437b9d53d687de2f8eb2b96437ec6da216adcb643ca
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h c4b9fa7a7e2bcdf850cfeb4b8a91d5ec47b7a00033bc996fd2ee96cbf2741f5f
@@@ -2059,8 -2059,11 +2059,9 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 8f2076553bc486ea6a17934695ecc02217461af2082d891697b62aab89bd1b43
- R 48a8d083139c4365079fe8210cacb510
- U stephan
- Z c7336980b293a293ed2df30baba9b924
 -P dab959ea3edf99788bfd76352cd46a3e56876b0e7d7008c6927aa14534853c50
 -R 1ce5997170cf4e38f2813ab1d1191f64
 -T *branch * make-sqlite3r.c
 -T *sym-make-sqlite3r.c *
 -T -sym-trunk *
++P 220cc4c6399b772b4ece03305a41b437ef0654d586a8a1c3dc5e7606fd36d655 59a837cfc7f9f96509491c8fc45355d2e8892af25246955e22adec1cbf37327b
++R 6b5395a59674684ae7409c1a67752bd1
++T +closed 59a837cfc7f9f96509491c8fc45355d2e8892af25246955e22adec1cbf37327b
+ U dan
 -Z c67d4c65fcd4c164d590b57cc9ec79e4
++Z 08a51ae8157c87edcee2b45d299f4155
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 9666b9600893c1712c57354ed6773ee216e4e778,5f09b562a65800aca7922c53c72db4616435f2e1..4c19a5133ea7c52c260a8b4bc3c8eb810cd98287
@@@ -1,1 -1,1 +1,1 @@@
- 220cc4c6399b772b4ece03305a41b437ef0654d586a8a1c3dc5e7606fd36d655
 -59a837cfc7f9f96509491c8fc45355d2e8892af25246955e22adec1cbf37327b
++5f135575b923cb59947667071c6af9ff14063c933cedf37d6c2a0a1b86c85032
diff --cc src/shell.c.in
Simple merge