mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-09-09 21:53:40 +00:00
Dion Moult
9d9f4054f6
The Python implementation of the Autodesk Forma connector
(bonsaiviewer_autodesk/) is deprecated. The Rust port that's been
maturing under src/bonsaiviewer-autodesk-rs/ is now the connector
and takes over the original folder name.
## File operations
* `git rm -r src/bonsaiviewer-autodesk` — drop the 18 tracked Python
source/test/packaging files. (~6.5k untracked build artefacts in
venv/build/dist/egg-info are removed too, but those were never in
the index.)
* `mv src/bonsaiviewer-autodesk-rs src/bonsaiviewer-autodesk` —
the Rust impl takes over the canonical folder name.
* `rm -rf src/bonsaiviewer-autodesk-rs-egui` — abandoned egui-based
experiment, never committed.
* `src/bonsaiviewer-autodesk/.gitignore` extended with `/dist` to
keep packaging output out of the index alongside the existing
`/target` rule.
The Rust binary in Cargo.toml already has `name = "bonsaiviewer-
autodesk"` and `connector.json`'s `exec` field already points at that
name — so the connector loader, build_viewer.sh symlink, and
win/build-all-win.py CONNECTOR_DIR all keep working without edits.
## Packaging shape preserved
`packaging/build.py` is rewritten to:
* shell out to `cargo build --release` instead of pyinstaller,
* copy the produced binary + connector.json into the same
`dist/autodesk/` layout the PyInstaller flow produced,
* zip into `dist/autodesk-<os>-<arch>.zip` with the same
naming pattern (CI artifact uploads keep working).
The Rust binary statically links its deps, so unlike PyInstaller
there's no `_internal/` directory — single executable inside
`dist/autodesk/`. Everything downstream (`build_viewer.sh` symlink,
`win/build-all-win.py collect_connector_files`, the zip step in
`build_rocky.yml`) only cares that `dist/autodesk/` exists, so the
on-disk contract is preserved.
Verified locally: `python3 src/bonsaiviewer-autodesk/packaging/build.py`
produces `dist/autodesk/{bonsaiviewer-autodesk, connector.json}`
(3.9 MB stripped ELF) and `dist/autodesk-linux-x86_64.zip` (~1.5 MB
compressed).
## CI updates
* `.github/workflows/build_rocky.yml` and `build_rocky_arm.yml`:
drop the `pip install ".[build]"` step — `packaging/build.py` is
stdlib-only now, the cargo build wrapped inside it does the work.
* `.github/workflows/build_win.yml`: same — drop pip install,
packaging script handles cargo internally.
* `.github/workflows/build-bonsaiviewer-autodesk.yml`: full rewrite
of the dedicated connector test/build workflow. Replaces the
Python {3.11, 3.13} test matrix with `cargo fmt --check`,
`cargo clippy --all-targets -- -D warnings`, and `cargo test
--all-features`. The OS/arch build matrix is unchanged
(linux-x86_64, macos-arm64, macos-x86_64, windows-x86_64) but
installs a Rust toolchain via dtolnay/rust-toolchain@stable and
caches target/ via Swatinem/rust-cache.
`win/build-all-win.py` and `build_viewer.sh` are unchanged — they
only reference the `dist/autodesk/` path, which the new
`packaging/build.py` populates identically.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
46 lines
1.4 KiB
Rust
46 lines
1.4 KiB
Rust
//! Minimal close-button test. Run with:
|
|
//! cargo run --example test_close
|
|
//!
|
|
//! Expected: a small window opens; clicking "Close" closes it and the
|
|
//! program exits with stderr lines tracing what happened. If the window
|
|
//! refuses to close, FLTK's hide() is misbehaving on this system and the
|
|
//! problem is below the dialog layer.
|
|
|
|
use fltk::{app, button::Button, prelude::*, window::Window};
|
|
|
|
fn main() {
|
|
eprintln!("[1] initialising FLTK");
|
|
let app = app::App::default();
|
|
|
|
eprintln!("[2] building window");
|
|
let mut win = Window::default()
|
|
.with_size(300, 120)
|
|
.with_label("Close test");
|
|
let mut close_btn = Button::new(100, 40, 100, 40, "Close");
|
|
win.end();
|
|
win.make_modal(true);
|
|
|
|
close_btn.set_callback({
|
|
let mut win = win.clone();
|
|
move |_| {
|
|
eprintln!("[5] close button callback fired");
|
|
win.hide();
|
|
eprintln!("[6] after win.hide(), shown() = {}", win.shown());
|
|
}
|
|
});
|
|
|
|
eprintln!("[3] win.show()");
|
|
win.show();
|
|
eprintln!("[4] entering app::wait() loop; shown() = {}", win.shown());
|
|
|
|
let mut ticks: u32 = 0;
|
|
while win.shown() {
|
|
app.wait();
|
|
ticks += 1;
|
|
if ticks % 100 == 0 {
|
|
eprintln!(" ... still in loop after {ticks} wait() calls, shown() = {}", win.shown());
|
|
}
|
|
}
|
|
eprintln!("[7] loop exited cleanly after {ticks} wait() calls");
|
|
}
|