7dc1bf27e0
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>
235 lines
8.2 KiB
HTML
235 lines
8.2 KiB
HTML
<!DOCTYPE html>
|
|
<html lang="en-us">
|
|
<head>
|
|
<meta charset="utf-8">
|
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
|
<title>KiCad PCBnew WASM (collab)</title>
|
|
<style>
|
|
.emscripten { padding-right: 0; margin-left: auto; margin-right: auto; display: block; }
|
|
div.emscripten { text-align: center; }
|
|
/* the canvas *must not* have any border or padding, or mouse coords will be wrong */
|
|
canvas.emscripten { border: 0px none; }
|
|
|
|
.window {
|
|
position: absolute;
|
|
pointer-events: none;
|
|
z-index: 10;
|
|
background-color: black;
|
|
overflow: hidden;
|
|
width: 0;
|
|
height: 0;
|
|
}
|
|
|
|
.window-canvas {
|
|
position: absolute;
|
|
top: 0;
|
|
left: 0;
|
|
pointer-events: none;
|
|
}
|
|
|
|
#status {
|
|
position: fixed;
|
|
bottom: 10px;
|
|
left: 10px;
|
|
color: #fff;
|
|
font-family: monospace;
|
|
z-index: 1000;
|
|
background: rgba(0,0,0,0.7);
|
|
padding: 10px;
|
|
border-radius: 5px;
|
|
}
|
|
|
|
#progress {
|
|
width: 300px;
|
|
height: 20px;
|
|
background: #333;
|
|
margin-top: 5px;
|
|
}
|
|
|
|
#progress-bar {
|
|
height: 100%;
|
|
background: #4CAF50;
|
|
width: 0%;
|
|
transition: width 0.3s;
|
|
}
|
|
</style>
|
|
</head>
|
|
<body style="margin: 0; padding: 0; width: 100%; height: 100%; overflow: hidden; background: #1a1a2e;">
|
|
<div id="main-window" style="width: 100vw; height: 100vh; position: absolute; top: 0; left: 0;"></div>
|
|
|
|
<div id="status">
|
|
<div id="status-text">Initializing...</div>
|
|
<div id="progress"><div id="progress-bar"></div></div>
|
|
</div>
|
|
|
|
<div id="window-container"></div>
|
|
|
|
<script>
|
|
var mainWindow = document.getElementById('main-window');
|
|
var statusText = document.getElementById('status-text');
|
|
var progressBar = document.getElementById('progress-bar');
|
|
|
|
var showError = function(msg) {
|
|
console.error('[KICAD_ERROR] ' + msg);
|
|
statusText.textContent = 'Error: ' + msg;
|
|
statusText.style.color = 'red';
|
|
};
|
|
|
|
var createCanvas = function() {
|
|
var canvas = document.createElement('canvas');
|
|
canvas.id = 'canvas';
|
|
canvas.style.display = 'none';
|
|
// wx.js owns the backing-store size via setWindowRect(); keep the HTML
|
|
// shell responsible only for the CSS size.
|
|
var width = window.innerWidth;
|
|
var height = window.innerHeight;
|
|
canvas.style.width = width + 'px';
|
|
canvas.style.height = height + 'px';
|
|
canvas.oncontextmenu = function() { event.preventDefault(); };
|
|
canvas.addEventListener("webglcontextlost", function(e) {
|
|
showError('WebGL context lost. You will need to reload the page.');
|
|
e.preventDefault();
|
|
}, false);
|
|
|
|
mainWindow.appendChild(canvas);
|
|
Module.canvas = canvas;
|
|
|
|
console.log('[KICAD] preRun complete, canvas created: ' + width + 'x' + height);
|
|
};
|
|
|
|
var onRuntimeInitialized = function() {
|
|
console.log('[KICAD] Runtime initialized');
|
|
var canvas = Module.canvas;
|
|
canvas.style.display = 'block';
|
|
document.getElementById('status').style.display = 'none';
|
|
};
|
|
|
|
// Pre-fetched resource data (fetched before pcbnew.js loads)
|
|
var resourceData = null;
|
|
|
|
// Start fetching images.tar.gz immediately (runs in parallel with WASM loading)
|
|
fetch('images.tar.gz')
|
|
.then(function(response) {
|
|
if (!response.ok) throw new Error('HTTP ' + response.status);
|
|
return response.arrayBuffer();
|
|
})
|
|
.then(function(buffer) {
|
|
resourceData = new Uint8Array(buffer);
|
|
console.log('[KICAD] Prefetched images.tar.gz (' + resourceData.length + ' bytes)');
|
|
})
|
|
.catch(function(err) {
|
|
console.warn('[KICAD] Could not prefetch images.tar.gz:', err.message);
|
|
});
|
|
|
|
// Write pre-fetched resources to FS (called in preRun after FS is available)
|
|
var writeResources = function() {
|
|
// Create directory structure matching KiCad's compiled-in KICAD_DATA path
|
|
// This path is baked in during CMake configuration
|
|
var resourcePath = '/workspace/build-wasm/sysroot/share/kicad/resources';
|
|
FS.mkdirTree(resourcePath);
|
|
|
|
// Write pre-fetched data if available
|
|
if (resourceData) {
|
|
FS.writeFile(resourcePath + '/images.tar.gz', resourceData);
|
|
console.log('[KICAD] Wrote images.tar.gz to ' + resourcePath);
|
|
} else {
|
|
console.warn('[KICAD] images.tar.gz not ready yet (WASM loaded faster than fetch)');
|
|
}
|
|
};
|
|
|
|
// KiCad's standalone entry (single_top.cpp) runs STARTWIZARD on launch: a
|
|
// modal first-run "Setup" wizard shown whenever the settings dir lacks a
|
|
// kicad_common.json or valid global library tables. In this ephemeral MEMFS
|
|
// that is EVERY load, and the wizard's modal event loop crashes Asyncify
|
|
// (func is not a function). Seed a minimal default config before main() so
|
|
// all three providers report NeedsUserInput()==false — equivalent to the
|
|
// wizard's "use defaults" path — and it never opens. Settings dir matches
|
|
// PATHS::GetUserSettingsPath() for this build.
|
|
//
|
|
// NB pcbnew.html (the plain harness) intentionally OMITS this seed because
|
|
// pcbnew.spec.ts explicitly exercises the wizard; the collab tests instead
|
|
// need a clean, wizard-free boot (like eeschema.html), hence this variant.
|
|
var seedKicadConfig = function() {
|
|
var cfgDir = '/home/kicad/.config/kicad/kicad/9.99';
|
|
FS.mkdirTree(cfgDir);
|
|
|
|
var writeIfAbsent = function(path, contents) {
|
|
try { FS.stat(path); return; } catch (e) { /* absent — seed it */ }
|
|
FS.writeFile(path, contents);
|
|
console.log('[KICAD] Seeded ' + path);
|
|
};
|
|
|
|
// SETTINGS provider: settings dir is "valid" once kicad_common.json exists.
|
|
// PRIVACY provider: both prompts must be flagged do-not-show-again.
|
|
writeIfAbsent(cfgDir + '/kicad_common.json', JSON.stringify({
|
|
do_not_show_again: { update_check_prompt: true, data_collection_prompt: true }
|
|
}, null, 2));
|
|
|
|
// LIBRARIES provider: needs valid global symbol/footprint/design-block
|
|
// tables. Empty (zero-row) tables parse fine and satisfy GlobalTablesValid().
|
|
writeIfAbsent(cfgDir + '/sym-lib-table', '(sym_lib_table\n (version 7)\n)\n');
|
|
writeIfAbsent(cfgDir + '/fp-lib-table', '(fp_lib_table\n (version 7)\n)\n');
|
|
writeIfAbsent(cfgDir + '/design-block-lib-table', '(design_block_lib_table\n (version 7)\n)\n');
|
|
};
|
|
|
|
var Module = {
|
|
thisProgram: '/usr/bin/pcbnew', // Fake absolute path for argv[0] (KiCad DEBUG check)
|
|
|
|
preRun: [createCanvas, writeResources, seedKicadConfig],
|
|
postRun: [],
|
|
|
|
print: function(text) {
|
|
if (arguments.length > 1)
|
|
text = Array.prototype.slice.call(arguments).join(' ');
|
|
console.log('[KICAD_OUT] ' + text);
|
|
},
|
|
|
|
printErr: function(text) {
|
|
if (arguments.length > 1)
|
|
text = Array.prototype.slice.call(arguments).join(' ');
|
|
console.error('[KICAD_ERR] ' + text);
|
|
},
|
|
|
|
setStatus: function(text) {
|
|
console.log('[KICAD_STATUS] ' + text);
|
|
statusText.textContent = text;
|
|
|
|
// Parse progress from status text
|
|
var match = text.match(/(\d+)\/(\d+)/);
|
|
if (match) {
|
|
var pct = (parseInt(match[1]) / parseInt(match[2])) * 100;
|
|
progressBar.style.width = pct + '%';
|
|
}
|
|
},
|
|
|
|
totalDependencies: 0,
|
|
monitorRunDependencies: function(left) {
|
|
this.totalDependencies = Math.max(this.totalDependencies, left);
|
|
Module.setStatus(left ? 'Preparing... (' + (this.totalDependencies-left) + '/' + this.totalDependencies + ')' : 'All downloads complete.');
|
|
},
|
|
|
|
onRuntimeInitialized: onRuntimeInitialized,
|
|
|
|
// Required for locating .wasm and .worker.js files
|
|
locateFile: function(path) {
|
|
return path;
|
|
}
|
|
};
|
|
|
|
Module.setStatus('Downloading...');
|
|
|
|
window.onerror = function(msg, url, line) {
|
|
showError(msg + ' at ' + url + ':' + line);
|
|
Module.setStatus = function(text) {
|
|
if (text) Module.printErr('[post-exception status] ' + text);
|
|
};
|
|
return false;
|
|
};
|
|
</script>
|
|
|
|
<!-- wxWidgets WASM glue code (defines getConfigEntryLength, etc.) -->
|
|
<script src="wx.js"></script>
|
|
<script src="wx-dom.js"></script>
|
|
<script async src="pcbnew.js"></script>
|
|
</body>
|
|
</html>
|