From: stephan Date: Fri, 20 Feb 2026 14:22:09 +0000 (+0000) Subject: Fix a cse in the fiddle.debug build where it could not overwrite its read-only/genera... X-Git-Tag: version-3.52.0~50 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9e395efec686281ca453ba2be80507bdef47e36e;p=thirdparty%2Fsqlite.git Fix a cse in the fiddle.debug build where it could not overwrite its read-only/generated index.html. FossilOrigin-Name: 7adb2c0f438a97d377760436b1ac81fffab36e541a2b5ee733bfc7108e0180e5 --- diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile index 4302647609..dc3c2d2555 100644 --- a/ext/wasm/GNUmakefile +++ b/ext/wasm/GNUmakefile @@ -206,7 +206,7 @@ b.mkdir@ = if [ ! -d $(dir $@) ]; then \ # $1 = logtag, $2 = src file(s). $3 = dest dir b.cp = $(call b.mkdir@); \ echo '$(logtag.$(1)) $(emo.disk) $(2) ==> $3'; \ - cp -p $(2) $(3) || exit + cp -f -p $(2) $(3) || exit # # $(call b.c-pp.shcmd,LOGTAG,src,dest,-Dx=y...) diff --git a/ext/wasm/mkwasmbuilds.c b/ext/wasm/mkwasmbuilds.c index 1b8b3d02ba..37f2967d88 100644 --- a/ext/wasm/mkwasmbuilds.c +++ b/ext/wasm/mkwasmbuilds.c @@ -994,10 +994,17 @@ static void mk_fiddle(void){ pf("$(out.%s.js): $(MAKEFILE_LIST) " "$(EXPORTED_FUNCTIONS.fiddle) " "$(fiddle.c.in) " - "$(pre-post.%s.deps)\n", + "$(pre-post.%s.deps)", zBuildName, zBuildName); + if( isDebug ){ + pf(" $(dir.fiddle)/fiddle-worker.js" + " $(dir.fiddle)/fiddle.js" + " $(dir.fiddle)/index.html"); + } + ps(""); emit_compile_start(zBuildName); - pf("\t$(b.cmd@)$(bin.emcc) -o $@" + pf("\t@$(call b.mkdir@)\n" + "\t$(b.cmd@)$(bin.emcc) -o $@" " $(emcc.flags.%s)" /* set in GNUmakefile */ " $(pre-post.%s.flags)" " $(fiddle.c.in)" diff --git a/manifest b/manifest index e0e6f9e434..d1d740ff1c 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\snew\sfunctions\sieee754_to_int()\sand\sieee754_from_int()\sto\sthe\nieee754\sextension.\s\sNo\schanges\sto\sthe\score\sSQLite. -D 2026-02-20T14:20:33.971 +C Fix\sa\scse\sin\sthe\sfiddle.debug\sbuild\swhere\sit\scould\snot\soverwrite\sits\sread-only/generated\sindex.html. +D 2026-02-20T14:22:09.912 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -581,7 +581,7 @@ F ext/session/sessionwor.test 6fd9a2256442cebde5b2284936ae9e0d54bde692d0f5fd009e F ext/session/sqlite3session.c 6ebd02be470f36d41c4bd78927f39d507b62051ba025eacaed9936c769902a07 F ext/session/sqlite3session.h 7404723606074fcb2afdc6b72c206072cdb2b7d8ba097ca1559174a80bc26f7a F ext/session/test_session.c 190110e3bd9463717248dec1272b44fe9943e57b7646d0b4200dcf11e4dccee6 -F ext/wasm/GNUmakefile a2698072853b67c39e92ca19835c65fbaa8b8884078a99c4e54b72b9ede8306e +F ext/wasm/GNUmakefile 79236447d750609aa6beda30feec1314180c5462a493ad94214122887232bfd4 F ext/wasm/README-dist.txt f01081a850ce38a56706af6b481e3a7878e24e42b314cfcd4b129f0f8427066a F ext/wasm/README.md 2e87804e12c98f1d194b7a06162a88441d33bb443efcfe00dc6565a780d2f259 F ext/wasm/SQLTester/GNUmakefile e0794f676d55819951bbfae45cc5e8d7818dc460492dc317ce7f0d2eca15caff @@ -634,7 +634,7 @@ F ext/wasm/index.html 475bc283338749db4e3fbf24cf3f5aa020cc85a1fffb780d400a915fcb F ext/wasm/jaccwabyt/jaccwabyt.js 4e2b797dc170851c9c530c3567679f4aa509eec0fab73b466d945b00b356574b F ext/wasm/jaccwabyt/jaccwabyt.md 6aa90fa1a973d0ad10d077088bea163b241d8470c75eafdef87620a1de1dea41 F ext/wasm/mkdist.sh f8883b077a2ca47cf92e6f0ce305fbf72ca648c3501810125056c4b09c2d5554 x -F ext/wasm/mkwasmbuilds.c 5d7baa9258299fd492351578a93dff960317822a08ee3ad6dd91ef5d21209812 +F ext/wasm/mkwasmbuilds.c 0e9198eb90acae4bcf57cf62d7186f6af5aaac02efdb075a1aded33614b3805a F ext/wasm/module-symbols.html e54f42112e0aac2a31f850ab33e7f2630a2ea4f63496f484a12469a2501e07e2 F ext/wasm/scratchpad-wasmfs.html a3d7388f3c4b263676b58b526846e9d02dfcb4014ff29d3a5040935286af5b96 F ext/wasm/scratchpad-wasmfs.mjs 66034b9256b218de59248aad796760a1584c1dd842231505895eff00dbd57c63 @@ -2195,8 +2195,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P 436dccd42650a6ab0a74459ae42fdb3e36d853f934324acc2bc961f87c001852 -R 2afe772fbea1438e3a27c2459d477b85 -U drh -Z 182dac5ab39ffff0cbe6eba3144bb514 +P 8660d3e94cbe892693554df282bce0fa8c7aedbc5e020cab647cbbff3d7e55b7 +R 389af95283f5ab275172b5b1245f2df2 +U stephan +Z 85bcd6f2a42107fa459e33d70b89b165 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index c194933323..b83452454a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -8660d3e94cbe892693554df282bce0fa8c7aedbc5e020cab647cbbff3d7e55b7 +7adb2c0f438a97d377760436b1ac81fffab36e541a2b5ee733bfc7108e0180e5