d6d743340dConvert the calculator port (commit 0464470) from the parallel/copy-paste
pattern to the dispatch pattern used by pcbnew + eeschema.
- docker/build.sh: <app> is now required (no pcbnew default); missing,
unknown, and --help paths all print "pcbnew | eeschema | calculator | all".
Adds calculator to build_app() via kicad_subdir_for() (pcb_calculator
inner subdir, calculator.* output basename). Also fixes the
EMSDK=/emsdkkicad-wasm-builder typo that snuck in during the calc merge.
- scripts/kicad/build-kicad-target.sh: accepts calculator; introduces
KICAD_TARGET (pcb_calculator for calc, == APP_NAME otherwise) used for
the make target, embind include path, and final-log line.
- scripts/kicad/build-calculator.sh: 305-line copy of build-pcbnew.sh
collapsed to a 7-line wrapper around build-kicad-target.sh.
- tests/scripts/setup-kicad-wasm.sh: copy_app calculator added with the
same pcb_calculator subdir mapping for the docker-volume fallback path.
- tests/package.json: test:calculator* routed through the shared
playwright-kicad.config.ts kicad/calculator.spec.ts (mirrors eeschema).
- Delete: docker/build-calculator.sh, tests/scripts/setup-calculator-wasm.sh,
tests/playwright-calculator.config.ts.
Bumps wxwidgets d1d1627 -> 6fb2eac (origin/wasm-port). The new sha includes
"unic/combobox: add GetCurrentSelection() inline default" which calc's
kicad/pcb_calculator/widgets/unit_selector.cpp needs to compile. Without
this bump the unified dispatch would expose calc as a buildable target but
the build itself would fail. Verified: build.sh all completes clean across
all three apps; pcbnew/eeschema e2e pass; calc compiles and launches (test
stability separate from this refactor).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
87 lines
3.4 KiB
Shell
Executable file
87 lines
3.4 KiB
Shell
Executable file
#!/bin/bash
|
|
# Copies KiCad WASM build output to test directory
|
|
#
|
|
# Priority: Use local output/ directory (populated by docker/build.sh)
|
|
# Fallback: Copy from Docker volume directly
|
|
#
|
|
# Copies whichever apps are present (pcbnew, eeschema, calculator).
|
|
|
|
set -e
|
|
|
|
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
|
PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
|
|
KICAD_TEST="$PROJECT_ROOT/tests/apps/kicad"
|
|
OUTPUT_DIR="$PROJECT_ROOT/output"
|
|
|
|
mkdir -p "$KICAD_TEST"
|
|
|
|
# Map an app name to its inner CMake build subdirectory. Most apps share their
|
|
# subdir name with the app name; pcb_calculator emits OUTPUT_NAME=calculator
|
|
# but lives under the pcb_calculator/ subtree of the build dir.
|
|
kicad_subdir_for() {
|
|
case "$1" in
|
|
calculator) echo "pcb_calculator" ;;
|
|
*) echo "$1" ;;
|
|
esac
|
|
}
|
|
|
|
# Copy one app's artifacts (js, wasm, optional debug/map/worker). Returns 0
|
|
# if the app was present, 1 if neither output/ nor the docker volume has it.
|
|
copy_app() {
|
|
local app="$1"
|
|
local subdir
|
|
subdir=$(kicad_subdir_for "$app")
|
|
|
|
if [ -f "$OUTPUT_DIR/${app}.js" ] && [ -f "$OUTPUT_DIR/${app}.wasm" ]; then
|
|
echo "Copying ${app} WASM files from output directory..."
|
|
cp "$OUTPUT_DIR/${app}.js" "$KICAD_TEST/"
|
|
cp "$OUTPUT_DIR/${app}.wasm" "$KICAD_TEST/"
|
|
cp "$OUTPUT_DIR/${app}.wasm.map" "$KICAD_TEST/" 2>/dev/null || true
|
|
cp "$OUTPUT_DIR/${app}.worker.js" "$KICAD_TEST/" 2>/dev/null || true
|
|
cp "$OUTPUT_DIR/images.tar.gz" "$KICAD_TEST/" 2>/dev/null || true
|
|
return 0
|
|
fi
|
|
|
|
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}/${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}/${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}/${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}/${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}/resources/images.tar.gz "$KICAD_TEST/" 2>/dev/null || true
|
|
return 0
|
|
fi
|
|
|
|
echo " (no ${app} artifacts found — skipping)"
|
|
return 1
|
|
}
|
|
|
|
found_any=0
|
|
copy_app pcbnew && found_any=1
|
|
copy_app eeschema && found_any=1
|
|
copy_app calculator && found_any=1
|
|
|
|
if [ "$found_any" -eq 0 ]; then
|
|
echo "Error: no pcbnew/eeschema/calculator artifacts found in output/ or docker volume" >&2
|
|
exit 1
|
|
fi
|
|
|
|
# wxWidgets WASM JavaScript glue code (defines JS functions called from WASM)
|
|
echo "Copying wxWidgets WASM glue code..."
|
|
if [ -f "$OUTPUT_DIR/wx.js" ]; then
|
|
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
|
|
:
|
|
else
|
|
cp "$PROJECT_ROOT/wxwidgets/build/wasm/wx.js" "$KICAD_TEST/"
|
|
fi
|
|
fi
|
|
|
|
echo "KiCad WASM files copied to $KICAD_TEST"
|
|
ls -lh "$KICAD_TEST"
|