Convert 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>
167 lines
6.1 KiB
Shell
Executable file
167 lines
6.1 KiB
Shell
Executable file
#!/bin/bash
|
|
# Build a KiCad app (pcbnew, eeschema, calculator) inside Docker, then run
|
|
# asyncify and friends on the host.
|
|
#
|
|
# Usage:
|
|
# ./docker/build.sh <app> [args...]
|
|
#
|
|
# Apps:
|
|
# pcbnew PCB editor
|
|
# eeschema schematic editor
|
|
# calculator PCB calculator
|
|
# all build pcbnew, eeschema, calculator sequentially
|
|
#
|
|
# Any extra args are forwarded to scripts/kicad/build-<app>.sh (e.g. -j 8,
|
|
# --full, --release, --diag=gal).
|
|
#
|
|
# The build is split into two phases:
|
|
# 1. Docker: Compile KiCad to WASM (without asyncify)
|
|
# 2. Host: Apply asyncify transformation (uses Binaryen v121)
|
|
#
|
|
# Binaryen is downloaded automatically - no prerequisites needed.
|
|
|
|
# Redirect all output to a log file (re-execs script with redirection).
|
|
# MUST be sourced before arg parsing — the re-exec relies on the original
|
|
# "$@", so any shifts before this point would strip args from the re-exec.
|
|
source "$(dirname "$0")/../scripts/common/logging.sh"
|
|
|
|
set -e
|
|
|
|
cd "$(dirname "$0")/.."
|
|
|
|
VALID_APPS="pcbnew | eeschema | calculator | all"
|
|
|
|
usage() {
|
|
echo "Usage: ./docker/build.sh <app> [args...]" >&2
|
|
echo " <app>: ${VALID_APPS}" >&2
|
|
echo " args: forwarded to scripts/kicad/build-<app>.sh (e.g. -j 8, --release)" >&2
|
|
}
|
|
|
|
# First positional arg must be the app name. No default — picking one would
|
|
# silently build the wrong thing for someone who forgot the argument.
|
|
if [[ "${1:-}" == "-h" ]] || [[ "${1:-}" == "--help" ]]; then
|
|
usage
|
|
exit 0
|
|
fi
|
|
if [[ $# -lt 1 ]] || [[ "$1" == -* ]]; then
|
|
echo "Error: missing <app> argument" >&2
|
|
usage
|
|
exit 1
|
|
fi
|
|
APP_NAME="$1"
|
|
shift
|
|
|
|
case "$APP_NAME" in
|
|
pcbnew|eeschema|calculator|all) ;;
|
|
*)
|
|
echo "Error: unknown app '$APP_NAME' (expected: ${VALID_APPS})" >&2
|
|
usage
|
|
exit 1
|
|
;;
|
|
esac
|
|
|
|
# Use branch name as Docker Compose project name for isolated containers/volumes
|
|
BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD | tr '/' '-' | tr '[:upper:]' '[:lower:]')
|
|
export COMPOSE_PROJECT_NAME="kicad-wasm-${BRANCH_NAME}"
|
|
echo "Using Docker project: ${COMPOSE_PROJECT_NAME}"
|
|
echo "Building app: ${APP_NAME}"
|
|
|
|
# Add -j 10 by default if no -j flag is given
|
|
ARGS=("$@")
|
|
if [[ ! " ${ARGS[*]} " =~ " -j " ]]; then
|
|
ARGS+=("-j" "10")
|
|
fi
|
|
|
|
# Start container if not running
|
|
docker compose -f docker/docker-compose.yml up -d
|
|
|
|
# Sync source code to container volume (fixes macOS Docker VirtioFS issues)
|
|
# Use --checksum to only transfer files with different CONTENT, not timestamps.
|
|
# This avoids the timestamp mismatch cycle that caused full rebuilds every time.
|
|
# Transferred files get current container time, so make detects them correctly.
|
|
echo "Syncing source code to container..."
|
|
# rsync into the macOS-backed volume intermittently hits transient VirtioFS glitches:
|
|
# temp-file rename failures (exit 23) or vanished-source files (exit 24, harmless).
|
|
# --inplace avoids the temp-file+rename pattern that triggers exit 23; retry up to 3x
|
|
# for any residual flakiness (--checksum makes each retry skip already-synced files).
|
|
sync_rc=0
|
|
for sync_attempt in 1 2 3; do
|
|
if docker compose -f docker/docker-compose.yml exec kicad-wasm-builder \
|
|
rsync -r --delete --checksum --inplace \
|
|
--exclude="build-wasm" \
|
|
--exclude="output" \
|
|
--exclude=".git" \
|
|
--exclude="logs" \
|
|
--exclude=".idea" \
|
|
--exclude="node_modules" \
|
|
--exclude="tools/emsdk" \
|
|
/workspace-host/ /workspace/
|
|
then
|
|
sync_rc=0
|
|
else
|
|
sync_rc=$?
|
|
fi
|
|
{ [ $sync_rc -eq 0 ] || [ $sync_rc -eq 24 ]; } && break
|
|
echo "rsync attempt ${sync_attempt} failed (exit ${sync_rc}); retrying in 2s..."
|
|
sleep 2
|
|
done
|
|
if [ $sync_rc -ne 0 ] && [ $sync_rc -ne 24 ]; then
|
|
echo "ERROR: source sync failed after retries (exit ${sync_rc})"; exit 1
|
|
fi
|
|
|
|
# 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.
|
|
kicad_subdir_for() {
|
|
case "$1" in
|
|
calculator) echo "pcb_calculator" ;;
|
|
*) echo "$1" ;;
|
|
esac
|
|
}
|
|
|
|
# Build one app: compile in container, then run host-side post-processing.
|
|
build_app() {
|
|
local app="$1"
|
|
local subdir
|
|
subdir=$(kicad_subdir_for "$app")
|
|
echo ""
|
|
echo "=== Building ${app} ==="
|
|
|
|
# Run build inside the container.
|
|
# -e EMSDK=/emsdk: `docker compose exec` bypasses the entrypoint that sources
|
|
# emsdk_env.sh, so the build shell would lack emcc/embuilder on PATH. Setting
|
|
# EMSDK lets scripts/common/env.sh source /emsdk/emsdk_env.sh and activate the toolchain.
|
|
docker compose -f docker/docker-compose.yml exec -e EMSDK=/emsdk kicad-wasm-builder \
|
|
"/workspace/scripts/kicad/build-${app}.sh" "${ARGS[@]}"
|
|
|
|
# Copy output to host-accessible directory.
|
|
# ${app}.wasm.debug.wasm contains DWARF debug info (when built with -gseparate-dwarf).
|
|
echo "Copying ${app} build output to ./output/..."
|
|
docker compose -f docker/docker-compose.yml exec kicad-wasm-builder \
|
|
bash -c "mkdir -p /workspace/output && \
|
|
cp /workspace/build-wasm/kicad-${app}/${subdir}/${app}.{js,wasm,wasm.debug.wasm,wasm.map,worker.js} /workspace/output/ 2>/dev/null || \
|
|
cp /workspace/build-wasm/kicad-${app}/${subdir}/${app}.{js,wasm} /workspace/output/; \
|
|
cp /workspace/build-wasm/kicad-${app}/resources/images.tar.gz /workspace/output/ 2>/dev/null || true; \
|
|
cp /workspace/build-wasm/wxwidgets/build/wasm/wx.js /workspace/output/ 2>/dev/null || true"
|
|
|
|
# Inject dynCall shims (fixes "dynCall_* is not defined" errors in Emscripten 4.x)
|
|
./scripts/common/inject-dyncall-shims.sh "output/${app}.js"
|
|
|
|
# Apply wasm-emscripten-finalize on host (skipped in Docker due to memory limits)
|
|
./scripts/common/apply-finalize.sh "output/${app}.wasm" "output/${app}.wasm"
|
|
|
|
# Apply asyncify transformation on host
|
|
./scripts/common/apply-asyncify.sh "output/${app}.wasm" "output/${app}.wasm"
|
|
}
|
|
|
|
if [[ "${APP_NAME}" == "all" ]]; then
|
|
build_app pcbnew
|
|
build_app eeschema
|
|
build_app calculator
|
|
else
|
|
build_app "${APP_NAME}"
|
|
fi
|
|
|
|
echo ""
|
|
echo "Build complete. Output files in ./output/"
|
|
ls -lh output/
|