c1ef489cfa
Replace the legacy Emscripten JS-exceptions model with native wasm-EH (legacy encoding) across the whole build, keeping Asyncify coroutines working via a from-source Binaryen --hoist-cpp-catches pre-pass. Net result: native-EH is the only build mode, the 3D viewer is on by default, and pcbnew shrinks substantially. Highlights: - Binaryen submodule everywhere + --hoist-cpp-catches integration in apply-asyncify; post-link Asyncify covers every app wasm (not just standalone test wasm). - Build deps (incl. OpenCASCADE without OCC_CONVERT_SIGNALS) and all KiCad apps with -fwasm-exceptions; emscripten_sleep added to the post-link asyncify-imports. - libcontext fiber entry wired under native exceptions; while-loop main loop + currData shim injected into all wx apps. - Native-EH collab apply fixed: DEBUG-define the embind TU + match all out-of-CMake C++ TUs' ABI flags to the core, fixing the vtable-layout skew / mis-dispatch. - 3D viewer enabled by default (real raytracer linked, not the stub). - Retire the EH-spike scaffolding; flip the asyncify-races ablation pins to shim-redundancy pins (native-EH stays clean with the legacy shims ablated). - Fix the asyncify-races quiescence check to not require Asyncify.currData==0: under the native-EH per-frame-yield top loop the main stack is asyncify-suspended every frame, so currData legitimately churns (a freed-but-not-yet-nulled buffer, not a leak). Refresh the pcbnew toolbar screenshot baseline for the new kicad. - CI: drop the obsolete binaryen_version input/env (the build uses the binaryen submodule fork's wasm-opt, not a version download); key the wasm-output cache on the binaryen submodule SHA instead. Bumps the wxwidgets + binaryen submodules to their squashed feature commits. Validated green: all 7 apps native-EH (real 3D in pcbnew); KiCad e2e 63/63 Firefox + Chromium (3D viewer renders); wx 336; coroutine 34/34 both engines; asyncify 7/7 both engines. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
61 lines
2.1 KiB
Docker
61 lines
2.1 KiB
Docker
# Plain Ubuntu base — multi-arch (ARM64/x86_64 auto-detected)
|
|
FROM ubuntu:22.04
|
|
|
|
ENV DEBIAN_FRONTEND=noninteractive
|
|
|
|
# Install build tools required for KiCad WASM build
|
|
RUN apt-get update && apt-get install -y \
|
|
cmake \
|
|
autoconf \
|
|
automake \
|
|
libtool \
|
|
meson \
|
|
ninja-build \
|
|
pkg-config \
|
|
curl \
|
|
git \
|
|
python3 \
|
|
python3-dev \
|
|
protobuf-compiler \
|
|
swig \
|
|
unixodbc-dev \
|
|
ccache \
|
|
rsync \
|
|
xz-utils \
|
|
unzip \
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
# Install emsdk from source (same approach as scripts/setup-emsdk.sh). The version is the SINGLE
|
|
# source of truth in scripts/common/versions.sh, passed in as a build arg by docker/build.sh (via the
|
|
# compose build.args). Do NOT hardcode it here — fail fast if the arg is missing so a stale image can
|
|
# never silently use the wrong toolchain.
|
|
ARG EMSCRIPTEN_VERSION
|
|
RUN test -n "${EMSCRIPTEN_VERSION}" || { echo "EMSCRIPTEN_VERSION build-arg required (scripts/common/versions.sh)"; exit 1; }; \
|
|
git clone https://github.com/emscripten-core/emsdk.git /emsdk \
|
|
&& cd /emsdk \
|
|
&& ./emsdk install ${EMSCRIPTEN_VERSION} \
|
|
&& ./emsdk activate ${EMSCRIPTEN_VERSION}
|
|
|
|
# Make Docker's own emsdk authoritative for EVERY process in the container, including
|
|
# `docker compose exec` (which bypasses the ENTRYPOINT). env.sh keys off $EMSDK: with it
|
|
# set, env.sh sources /emsdk/emsdk_env.sh and never falls back to the local tools/emsdk
|
|
# (which, inside this Linux container, can be a host macOS emsdk rsync'd in by mistake and
|
|
# thus unrunnable). This is what lets the wxWidgets autoconf build find emmake on PATH.
|
|
ENV EMSDK=/emsdk
|
|
|
|
# Configure ccache for Emscripten
|
|
# CCACHE_DIR in named volume persists across containers
|
|
ENV CCACHE_DIR=/workspace/build-wasm/.ccache
|
|
ENV CCACHE_MAXSIZE=10G
|
|
ENV CCACHE_COMPILERCHECK=content
|
|
ENV CCACHE_SLOPPINESS=include_file_mtime,time_macros,pch_defines
|
|
ENV CCACHE_BASEDIR=/workspace
|
|
|
|
WORKDIR /workspace
|
|
|
|
# Entry point that sources Emscripten environment
|
|
COPY docker/entrypoint.sh /entrypoint.sh
|
|
RUN chmod +x /entrypoint.sh
|
|
|
|
ENTRYPOINT ["/entrypoint.sh"]
|
|
CMD ["bash"]
|