From: drh <> Date: Mon, 3 Feb 2025 14:44:16 +0000 (+0000) Subject: Fix the build process on Windows so that it generates identical sqlite3.c, X-Git-Tag: version-3.49.0~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf9f841c5e64a71ee5566b653c59d610e2685ac1;p=thirdparty%2Fsqlite.git Fix the build process on Windows so that it generates identical sqlite3.c, sqlite3.h, and shell.c files on Windows and Unix. This patch also includes a change to JS bindings that got caught up in the branch. FossilOrigin-Name: 91ef45fc2902e46813366ec6b8317209f39f10e4a23c3808e33aceedab9da6c7 --- cf9f841c5e64a71ee5566b653c59d610e2685ac1 diff --cc manifest index 4c732ac4a4,1335b4ed07..c36f2724d2 --- a/manifest +++ b/manifest @@@ -1,5 -1,5 +1,5 @@@ - C Add\sa\sheader\scomment\sto\stest/speedtest1.c\sthat\soutlines\show\sto\scompile\sthe\nprogram\susing\shistorical\samalgamation\ssources,\sfor\scomparison\stesting. - D 2025-02-02T18:01:32.649 -C Bring\sthe\sautoconf-tarball\sMakefile.msc\sinto\salignment\swith\sthe\smain\nMakefile.msc. -D 2025-02-03T14:40:05.237 ++C Fix\sthe\sbuild\sprocess\son\sWindows\sso\sthat\sit\sgenerates\sidentical\ssqlite3.c,\nsqlite3.h,\sand\sshell.c\sfiles\son\sWindows\sand\sUnix.\s\sThis\spatch\salso\sincludes\na\schange\sto\sJS\sbindings\sthat\sgot\scaught\sup\sin\sthe\sbranch. ++D 2025-02-03T14:44:16.557 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@@ -2209,8 -2209,8 +2209,9 @@@ F tool/version-info.c 3b36468a90faf1bbd F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f - P 5216452047eecdd6c0f6ab85b304f975ed05a394a4ad9ae793fb65d645502b12 - R e5e73e420449b95dfe1df31fa75f6670 -P 76c8435a5f390001038b8ee94322ff478c9d5f29501ed1c5891c952a41e377aa ++P 602d4dd69ec9a724c69cb41ab15376ec731bfd4894fac0a2b25076b857786c6d 52a7a162d131532de8f4403b099fa122fc72c80f71494fb561afc4e0ff8e6bf4 + R ffc4ba900908f24af2ec6f8d798eed37 ++T +closed 52a7a162d131532de8f4403b099fa122fc72c80f71494fb561afc4e0ff8e6bf4 U drh - Z c88ad2ace3864df1c4b3b50fb44cd819 -Z bc5ceaf13617b69dbeab721c1380d466 ++Z 167889892c0bdca97b0a614e610568d1 # Remove this line to create a well-formed Fossil manifest. diff --cc manifest.uuid index e6c8d08022,a166adab6f..367348a3ff --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 602d4dd69ec9a724c69cb41ab15376ec731bfd4894fac0a2b25076b857786c6d -52a7a162d131532de8f4403b099fa122fc72c80f71494fb561afc4e0ff8e6bf4 ++91ef45fc2902e46813366ec6b8317209f39f10e4a23c3808e33aceedab9da6c7