refactor: collapse dual-mode plumbing — the DOM port is the only WASM build
The canvas (wxUniversal) mode is gone (wxwidgets submodule); remove every piece of side-by-side plumbing so there is exactly one build and one test flow: - scripts/build-wxuniversal-wasm.sh -> scripts/build-wx-wasm.sh; no --dom/--enable-universal; builds into build-wasm/wxwidgets - build-wasm-test.sh: no DOM_BUILD / apps-dom rsync mirror / PORT=dom; apps build straight into tests/apps (Makefile.wasm PORT conditionals collapsed; wx.js + wx-dom.js always pre-js) - docker/build.sh, build-kicad-target.sh, env.sh: WX_PORT / -dom / -universal suffixes removed; kicad builds to kicad-<app>, outputs to output/; wx.js/wx-dom.js copied from the real source path (/workspace/wxwidgets/build/wasm — the old build-wasm path never existed and silently failed) - setup-kicad-wasm.sh: single target dir; the perl wx-dom.js injection is gone — the 7 checked-in kicad pages now reference wx-dom.js directly - playwright configs serve apps/; fixtures drop the test-results/dom and logs/wxwidgets/dom namespacing; boot.spec asserts wxDomPort unconditionally; pcbnew.spec uses one reference image; appearance.spec assertions unconditional - compare/update-baseline-screenshots.sh: --port removed - tests/gal-regression/wasm/Makefile: links build-wasm/wxwidgets and carries wx-dom.js as a second pre-js — the gal-webgl suite (30 specs) now actually builds and runs here (it needed host-side boost+glm via scripts/deps; the bundle had been missing, timing the whole spec out) - tests: clickCanvas() dispatches via page.mouse (DOM widgets legitimately cover the canvas; locator actionability refused the click); the comprehensive spec drives wxChoice through its native <select> (browser-owned popup cannot be coordinate-clicked) - docs: README/CLAUDE.md/build.md script names and dirs; features/wx-dom-port README reframed (DOM is THE port), visual-notes bugs 26-28; FindwxWidgets.cmake config label drops 'wasmuniv' - wxwidgets submodule -> 9dbacc9448 (DOM-only port, fork diff shrunk) Gate: full wx e2e suite 292 passed / 1 skipped / 0 failed — first run ever with the gal-webgl specs green (28 scenarios + load + sequential). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
parent
2c1b0d409b
commit
7dc1bf27e0
32 changed files with 199 additions and 335 deletions
|
|
@ -11,17 +11,8 @@ set -e
|
|||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
|
||||
|
||||
# WX_PORT=dom serves the DOM-flavor bundles (built by docker/build.sh with
|
||||
# WX_PORT=dom into output-dom/) from tests/apps-dom/kicad.
|
||||
if [ "${WX_PORT:-}" = "dom" ]; then
|
||||
KICAD_TEST="$PROJECT_ROOT/tests/apps-dom/kicad"
|
||||
OUTPUT_DIR="$PROJECT_ROOT/output/dom"
|
||||
KICAD_BUILD_SUFFIX="-dom"
|
||||
else
|
||||
KICAD_TEST="$PROJECT_ROOT/tests/apps/kicad"
|
||||
OUTPUT_DIR="$PROJECT_ROOT/output"
|
||||
KICAD_BUILD_SUFFIX=""
|
||||
fi
|
||||
KICAD_TEST="$PROJECT_ROOT/tests/apps/kicad"
|
||||
OUTPUT_DIR="$PROJECT_ROOT/output"
|
||||
|
||||
mkdir -p "$KICAD_TEST"
|
||||
|
||||
|
|
@ -72,15 +63,15 @@ copy_app() {
|
|||
|
||||
echo "Output ${app} not found locally, trying Docker volume..."
|
||||
if docker compose -f "$PROJECT_ROOT/docker/docker-compose.yml" cp \
|
||||
kicad-wasm-builder:/workspace/build-wasm/kicad-${app}${KICAD_BUILD_SUFFIX}/${subdir}/${app}.js "$KICAD_TEST/" 2>/dev/null \
|
||||
kicad-wasm-builder:/workspace/build-wasm/kicad-${app}/${subdir}/${app}.js "$KICAD_TEST/" 2>/dev/null \
|
||||
&& docker compose -f "$PROJECT_ROOT/docker/docker-compose.yml" cp \
|
||||
kicad-wasm-builder:/workspace/build-wasm/kicad-${app}${KICAD_BUILD_SUFFIX}/${subdir}/${app}.wasm "$KICAD_TEST/" 2>/dev/null; then
|
||||
kicad-wasm-builder:/workspace/build-wasm/kicad-${app}/${subdir}/${app}.wasm "$KICAD_TEST/" 2>/dev/null; then
|
||||
docker compose -f "$PROJECT_ROOT/docker/docker-compose.yml" cp \
|
||||
kicad-wasm-builder:/workspace/build-wasm/kicad-${app}${KICAD_BUILD_SUFFIX}/${subdir}/${app}.wasm.map "$KICAD_TEST/" 2>/dev/null || true
|
||||
kicad-wasm-builder:/workspace/build-wasm/kicad-${app}/${subdir}/${app}.wasm.map "$KICAD_TEST/" 2>/dev/null || true
|
||||
docker compose -f "$PROJECT_ROOT/docker/docker-compose.yml" cp \
|
||||
kicad-wasm-builder:/workspace/build-wasm/kicad-${app}${KICAD_BUILD_SUFFIX}/${subdir}/${app}.worker.js "$KICAD_TEST/" 2>/dev/null || true
|
||||
kicad-wasm-builder:/workspace/build-wasm/kicad-${app}/${subdir}/${app}.worker.js "$KICAD_TEST/" 2>/dev/null || true
|
||||
docker compose -f "$PROJECT_ROOT/docker/docker-compose.yml" cp \
|
||||
kicad-wasm-builder:/workspace/build-wasm/kicad-${app}${KICAD_BUILD_SUFFIX}/resources/images.tar.gz "$KICAD_TEST/" 2>/dev/null || true
|
||||
kicad-wasm-builder:/workspace/build-wasm/kicad-${app}/resources/images.tar.gz "$KICAD_TEST/" 2>/dev/null || true
|
||||
return 0
|
||||
fi
|
||||
|
||||
|
|
@ -107,33 +98,19 @@ if [ -f "$OUTPUT_DIR/wx.js" ]; then
|
|||
smart_cp "$OUTPUT_DIR/wx.js" "$KICAD_TEST"
|
||||
else
|
||||
if docker compose -f "$PROJECT_ROOT/docker/docker-compose.yml" cp \
|
||||
kicad-wasm-builder:/workspace/build-wasm/wxwidgets/build/wasm/wx.js "$KICAD_TEST/" 2>/dev/null; then
|
||||
kicad-wasm-builder:/workspace/wxwidgets/build/wasm/wx.js "$KICAD_TEST/" 2>/dev/null; then
|
||||
:
|
||||
else
|
||||
smart_cp "$PROJECT_ROOT/wxwidgets/build/wasm/wx.js" "$KICAD_TEST"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "${WX_PORT:-}" = "dom" ]; then
|
||||
# DOM port: the control-layer shim loads after wx.js.
|
||||
if [ -f "$OUTPUT_DIR/wx-dom.js" ]; then
|
||||
smart_cp "$OUTPUT_DIR/wx-dom.js" "$KICAD_TEST"
|
||||
else
|
||||
smart_cp "$PROJECT_ROOT/wxwidgets/build/wasm/wx-dom.js" "$KICAD_TEST"
|
||||
fi
|
||||
|
||||
# The checked-in kicad pages load wx.js via a <script> tag; the DOM
|
||||
# flavor needs wx-dom.js right after it. Sync the pages and inject the
|
||||
# tag (idempotent).
|
||||
for page in "$PROJECT_ROOT"/tests/apps/kicad/*.html; do
|
||||
[ -f "$page" ] || continue
|
||||
dest="$KICAD_TEST/$(basename "$page")"
|
||||
cp "$page" "$dest"
|
||||
if ! grep -q 'wx-dom.js' "$dest"; then
|
||||
perl -i -pe 's{(<script src="wx.js"></script>)}{$1\n <script src="wx-dom.js"></script>}' "$dest"
|
||||
fi
|
||||
done
|
||||
echo " + kicad pages with wx-dom.js injected"
|
||||
# The control-layer shim loads after wx.js (the checked-in kicad pages
|
||||
# reference both via <script> tags).
|
||||
if [ -f "$OUTPUT_DIR/wx-dom.js" ]; then
|
||||
smart_cp "$OUTPUT_DIR/wx-dom.js" "$KICAD_TEST"
|
||||
else
|
||||
smart_cp "$PROJECT_ROOT/wxwidgets/build/wasm/wx-dom.js" "$KICAD_TEST"
|
||||
fi
|
||||
|
||||
echo "KiCad WASM files synced to $KICAD_TEST"
|
||||
|
|
|
|||
Loading…
Reference in a new issue