接续上一轮:推进浏览器验证与M428配置收拢
结论:已完成浏览器侧真实加载验证,M428/M429/M430 的配置入口进一步从 LinuxCNC INI/HALFILE/REMAP 来源生成,native 与 source-link 验证通过。
This commit is contained in:
@@ -26,8 +26,10 @@ count_nonempty_lines() {
|
||||
}
|
||||
|
||||
# This script writes fixed build and public artifact paths, so serialize it.
|
||||
if [[ "${CNC_SIM_BUILD_WASM_SKIP_LOCK:-0}" != "1" ]]; then
|
||||
exec 9>"${TMPDIR:-/tmp}/cnc_sim_build_wasm.lock"
|
||||
flock 9
|
||||
fi
|
||||
|
||||
manifest_core_count=0
|
||||
manifest_blocked_count=0
|
||||
@@ -40,10 +42,11 @@ if [[ "$manifest_core_count" -eq 0 || "$manifest_blocked_count" -eq 0 ]]; then
|
||||
echo "unexpected wasm manifest partition: core=$manifest_core_count blocked=$manifest_blocked_count" >&2
|
||||
exit 1
|
||||
fi
|
||||
if [[ "$manifest" == "$default_manifest" ]] && [[ "$manifest_core_count" -ne 25 || "$manifest_blocked_count" -ne 1 ]]; then
|
||||
if [[ "$manifest" == "$default_manifest" ]] && [[ "$manifest_core_count" -ne 25 || "$manifest_blocked_count" -ne 9 ]]; then
|
||||
echo "unexpected wasm manifest partition: core=$manifest_core_count blocked=$manifest_blocked_count" >&2
|
||||
exit 1
|
||||
fi
|
||||
LINUXCNC_ROOT="$linuxcnc_root" ./check-linuxcnc-inputs.sh "$manifest" --require-rs274-complete
|
||||
|
||||
echo "LinuxCNC wasm blocker scan"
|
||||
./test-linuxcnc-wasm-blockers.sh "$manifest"
|
||||
@@ -78,6 +81,9 @@ echo "LinuxCNC wasm interp_find link probe"
|
||||
echo "LinuxCNC wasm python_plugin link probe"
|
||||
./test-linuxcnc-wasm-python-plugin-link.sh
|
||||
|
||||
echo "LinuxCNC wasm Python C API symbol probe"
|
||||
./test-linuxcnc-wasm-python-c-api-symbols.sh
|
||||
|
||||
echo "LinuxCNC wasm rs274ngc_pre object probe"
|
||||
./test-linuxcnc-wasm-rs274ngc-pre-object.sh
|
||||
|
||||
@@ -87,8 +93,18 @@ echo "LinuxCNC wasm rs274ngc_pre link blocker scan"
|
||||
echo "LinuxCNC wasm rs274ngc_pre link probe"
|
||||
./test-linuxcnc-wasm-rs274ngc-pre-link.sh "$manifest"
|
||||
|
||||
if ! command -v emcmake >/dev/null 2>&1; then
|
||||
echo "Emscripten is required. Install/activate emsdk so emcmake and emcc are in PATH." >&2
|
||||
echo "LinuxCNC wasm runtime link probe"
|
||||
./test-linuxcnc-wasm-runtime-link.sh "$manifest"
|
||||
|
||||
missing_tools=()
|
||||
for required_tool in cmake emcmake emcc node; do
|
||||
if ! command -v "$required_tool" >/dev/null 2>&1; then
|
||||
missing_tools+=("$required_tool")
|
||||
fi
|
||||
done
|
||||
if ((${#missing_tools[@]} > 0)); then
|
||||
echo "WASM build tools are required. Missing: ${missing_tools[*]}." >&2
|
||||
echo "Install/activate cmake, emsdk, and Node.js so cmake, emcmake, emcc, and node are in PATH." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@@ -97,8 +113,12 @@ emcmake cmake -S core -B build/wasm \
|
||||
-DCNC_SIM_LINUXCNC_ROOT="$linuxcnc_root" \
|
||||
-DCNC_SIM_LINUXCNC_WASM_SOURCE_MANIFEST="$manifest" \
|
||||
-DCNC_SIM_ENABLE_LINUXCNC_WASM_SAFE_PROBE=ON
|
||||
cmake --build build/wasm
|
||||
|
||||
cmake --build build/wasm --target cnc_sim_wasm_runtime_probe
|
||||
cmake --build build/wasm --target cnc_sim_wasm
|
||||
mkdir -p web/public
|
||||
cp build/wasm/cnc_sim.js web/public/
|
||||
cp build/wasm/cnc_sim.wasm web/public/
|
||||
cp build/wasm/cnc_sim.js web/public/cnc_sim.js
|
||||
cp build/wasm/cnc_sim.wasm web/public/cnc_sim.wasm
|
||||
cmp -s build/wasm/cnc_sim.js web/public/cnc_sim.js
|
||||
cmp -s build/wasm/cnc_sim.wasm web/public/cnc_sim.wasm
|
||||
node test-web-wasm-node-smoke.cjs
|
||||
./test-web-wasm-browser-smoke.sh
|
||||
|
||||
Reference in New Issue
Block a user