From: stephan Date: Thu, 12 Jun 2025 10:56:16 +0000 (+0000) Subject: Help ext/wasm 'make snapshot' find the wasm docs dir when it's run from outside of... X-Git-Tag: release~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e7d0e24905aee7715cd80690469a51e92b8841c;p=thirdparty%2Fsqlite.git Help ext/wasm 'make snapshot' find the wasm docs dir when it's run from outside of my usual checkout structure. FossilOrigin-Name: 0e04136bc5a72b47b476258ac234364f677d7ee50e3f3710b23f3e2c6e163df5 --- diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile index 6470fd6308..99fa305537 100644 --- a/ext/wasm/GNUmakefile +++ b/ext/wasm/GNUmakefile @@ -1193,9 +1193,11 @@ push-testing: ######################################################################## # If we find a copy of the sqlite.org/wasm docs checked out, copy # certain files over to it, noting that some need automatable edits... -wasm.docs.home ?= ../../../wasm -wasm.docs.found = $(if $(wildcard $(wasm.docs.home)/api-index.md),\ - $(wildcard $(wasm.docs.home)),) +wasm.docs.home ?= $(firstword $(wildcard ../../../wasm $(HOME)/f/s/wasm)) +wasm.docs.found = $(if \ + $(wildcard $(wasm.docs.home)/api-index.md),$(wildcard $(wasm.docs.home)),) +# ^^^ don't split between the args there, else it can introduce an extra +# space. .PHONY: update-docs ifeq (,$(wasm.docs.found)) update-docs: diff --git a/manifest b/manifest index c8f6f32121..8c0f7260d1 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sproblem\swith\sUPDATEs\son\sfts5\stables\sthat\scontain\sblob\svalues. -D 2025-06-11T17:24:46.640 +C Help\sext/wasm\s'make\ssnapshot'\sfind\sthe\swasm\sdocs\sdir\swhen\sit's\srun\sfrom\soutside\sof\smy\susual\scheckout\sstructure. +D 2025-06-12T10:56:16.244 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -621,7 +621,7 @@ F ext/session/sqlite3session.c 6b0877fe1ab832aa4b85eaca72606dfd1630a1363a1be7af1 F ext/session/sqlite3session.h 9bb1a6687b467764b35178dc29bbd2c57ab8cd3acdc8a62f088c34ad17e4fe2b F ext/session/test_session.c 2ddff73ea368d827028c32851b291416e1008845832feb27b751d15e57e13cc3 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c -F ext/wasm/GNUmakefile d6b869cf3d3eaaec8cf56adf925910c3e443f455562bcb4a4cd2d1e43c933d8d +F ext/wasm/GNUmakefile a9acd702e7423cd47b96b78d0ef546bb7612fa7731e1b400261def96bd90385e F ext/wasm/README-dist.txt f01081a850ce38a56706af6b481e3a7878e24e42b314cfcd4b129f0f8427066a F ext/wasm/README.md b89605f65661cf35bf034ff6d43e448cc169b8017fc105d498e33b81218b482c F ext/wasm/SQLTester/GNUmakefile e0794f676d55819951bbfae45cc5e8d7818dc460492dc317ce7f0d2eca15caff @@ -2209,9 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P e9652e398ef2f6d5eed41a16231cf3af038c5c14433704fdcf1945c872659aaf -Q +badf3014bd1620fd3d4b8013f641fd820b249649fb93cc75b7b8df9dfd6f32a6 -R 69077b7ca8d03f6c7406fb8866d66063 -U drh -Z a34e056dfc24882ea2df5c4edf22a1d9 +P 2b4577d83ca6a9f404300a719e1e0920dc40302d9cd9f30d1fc204b109e2726f +R 4b695ce69f7528665d35b4d32eb8f431 +U stephan +Z 9f2389381398effc878ae4135a87e223 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 2b0ba158af..2fc78188c2 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2b4577d83ca6a9f404300a719e1e0920dc40302d9cd9f30d1fc204b109e2726f +0e04136bc5a72b47b476258ac234364f677d7ee50e3f3710b23f3e2c6e163df5