From 29d1d91502daa2b35a3cd816cb7357ca89991aaa Mon Sep 17 00:00:00 2001 From: stephan Date: Sun, 8 Dec 2024 18:38:40 +0000 Subject: [PATCH 1/2] Add a note in Makefile.msc about EXTRA_SRC files possibly requiring manual editing, as discussed in [forum:903f721f3e7c0d25|forum thread 903f721f3e7c0d25]. FossilOrigin-Name: 229c2f013c171bc220148c78f7db5396578f2c6aac28ad6ff9b687c9fa4998ac --- Makefile.msc | 4 +++- manifest | 14 +++++++------- manifest.uuid | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Makefile.msc b/Makefile.msc index 6da1e399d2..14f2ab8c67 100644 --- a/Makefile.msc +++ b/Makefile.msc @@ -19,7 +19,9 @@ USE_AMALGAMATION = 1 # <> # Optionally set EXTRA_SRC to a list of C files to append to -# the generated sqlite3.c. +# the generated sqlite3.c. Any sqlite3 extensions added this +# way may require manual editing, as described in +# https://sqlite.org/forum/forumpost/903f721f3e7c0d25 # !IFNDEF EXTRA_SRC EXTRA_SRC = diff --git a/manifest b/manifest index 37a1d128b2..8409fd7ac5 100644 --- a/manifest +++ b/manifest @@ -1,11 +1,11 @@ -C Yet\sanother\siteration\sof\sthe\ssolution\sto\sthe\sfloating-point\sconversion\nproblem\s-\sthis\swhat\savoids\scomplaints\sabout\soversize\sdouble\svalues\nfrom\s-fsanitize. -D 2024-12-07T19:57:30.181 +C Add\sa\snote\sin\sMakefile.msc\sabout\sEXTRA_SRC\sfiles\spossibly\srequiring\smanual\sediting,\sas\sdiscussed\sin\s[forum:903f721f3e7c0d25|forum\sthread\s903f721f3e7c0d25]. +D 2024-12-08T18:38:40.817 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d F Makefile.in 86e81bdb118bf332a27865090b7dce96ddde93c2f1586e1b911569acaa228f19 F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0 -F Makefile.msc f8b4097dd93bd19df8fda39ca8b530904c2e7134a28094f490c0dc11abd47ce2 +F Makefile.msc f402bb6ea63b44f5143aa3c637aa3f69794cf14b1cc964eb97c4f53124198561 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159 F VERSION 8dc0c3df15fd5ff0622f88fc483533fce990b1cbb2f5fb9fdfb4dbd71eef2889 F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5 @@ -2202,8 +2202,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 351de57f80b73045448c71d3402d877ff5d72418b1f5fc34c8147a04f7c5cb78 -R 9235bc27c60f84c2f272e364b7977ec9 -U drh -Z 7dbec0e81d7a36c7e20ad06b81edda4b +P fc6904a508eb732b1cb5cc12321a0d637d97e1e066a022a2c93cb50595f3a86a +R 3e289435836b044f0b3a05a6e7cf9761 +U stephan +Z ff68f775396c11772c2696190687380e # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index cde712b675..d416251529 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -fc6904a508eb732b1cb5cc12321a0d637d97e1e066a022a2c93cb50595f3a86a +229c2f013c171bc220148c78f7db5396578f2c6aac28ad6ff9b687c9fa4998ac From fd360c39437e05a7e8bf5388152b12ed186b1dd8 Mon Sep 17 00:00:00 2001 From: drh <> Date: Mon, 9 Dec 2024 10:52:28 +0000 Subject: [PATCH 2/2] Resynchronize autoconf/Makefile.msc FossilOrigin-Name: 8f9c640818871c451e69f186224bf276f8a03c8d31a76806d81f34922a169f82 --- autoconf/Makefile.msc | 4 +++- manifest | 14 +++++++------- manifest.uuid | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/autoconf/Makefile.msc b/autoconf/Makefile.msc index 29bb7174fb..c23bbf494a 100644 --- a/autoconf/Makefile.msc +++ b/autoconf/Makefile.msc @@ -19,7 +19,9 @@ TOP = . # Optionally set EXTRA_SRC to a list of C files to append to -# the generated sqlite3.c. +# the generated sqlite3.c. Any sqlite3 extensions added this +# way may require manual editing, as described in +# https://sqlite.org/forum/forumpost/903f721f3e7c0d25 # !IFNDEF EXTRA_SRC EXTRA_SRC = diff --git a/manifest b/manifest index 8409fd7ac5..91254c4f46 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sa\snote\sin\sMakefile.msc\sabout\sEXTRA_SRC\sfiles\spossibly\srequiring\smanual\sediting,\sas\sdiscussed\sin\s[forum:903f721f3e7c0d25|forum\sthread\s903f721f3e7c0d25]. -D 2024-12-08T18:38:40.817 +C Resynchronize\sautoconf/Makefile.msc +D 2024-12-09T10:52:28.934 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -18,7 +18,7 @@ F auto.def 8f15c373e88c4c5296d6100e3d35893bd6edb57cebcb6a8c1e827e6faaef52e4 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac -F autoconf/Makefile.msc 1162ef7b7937ba6927b038f824b050855784d417e785fe35ab71d20afd18022b +F autoconf/Makefile.msc 0735351f6002f0bf78b73b3b7a6a120cff38573dd37c37005b682ecc44c25bc2 F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7 F autoconf/README.txt 5e946ffb6fbdbb114c81e1bdc862df27fce8beab557d7b0421820b0fe8fc048f F autoconf/configure.ac ec7fa914c5e74ff212fe879f9bb6918e1234497e05facfb641f30c4d5893b277 @@ -2202,8 +2202,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P fc6904a508eb732b1cb5cc12321a0d637d97e1e066a022a2c93cb50595f3a86a -R 3e289435836b044f0b3a05a6e7cf9761 -U stephan -Z ff68f775396c11772c2696190687380e +P 229c2f013c171bc220148c78f7db5396578f2c6aac28ad6ff9b687c9fa4998ac +R 50045aa0a973371ebf0a05224448e665 +U drh +Z 15c9820ccf429ada5e7694a1bec9cb28 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index d416251529..603d2bc368 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -229c2f013c171bc220148c78f7db5396578f2c6aac28ad6ff9b687c9fa4998ac +8f9c640818871c451e69f186224bf276f8a03c8d31a76806d81f34922a169f82