Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ members = [

# runtime.json is the source contract shared by every OctoSense application.
[workspace.dependencies]
makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "a5a3cf5b0dbd1b56c25defe6d98479f25843e770" }
makepad-script = { git = "https://github.com/OctoSense-org/makepad.git", rev = "a5a3cf5b0dbd1b56c25defe6d98479f25843e770" }
makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "bcb0583b50a8de8cad912e6c1505f09d8f894431" }
makepad-script = { git = "https://github.com/OctoSense-org/makepad.git", rev = "bcb0583b50a8de8cad912e6c1505f09d8f894431" }
# The VM-independent Octoscript node model, from the Octoscript repo itself.
octoscript-ui-l0 = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "76032ed4b0a9cce346cbc9e4f9f30fe00d76e65b" }

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ Each new theme is just more variants in `octoscript-widgets` + a `.octoscript` c
Building + running the `kit-host` against upstream surfaced exactly **one** thing upstream doesn't have: a **`Splash` main-VM-mount option**. Upstream's `Splash` always allocates an *isolate* VM (`alloc_splash_vm_with_network(allow_net)`), but the light theme and a shared heap live on the app's **main** VM. The fix is the small `isolate: false` field this project's fork added to `widgets/src/splash.rs` — upstreaming it lets a trusted, app-generated kit mount on the main VM (correct theme, no isolate-heap animator panics). Until then the kit mounts on an isolate (dark-default theme). That is the *only* upstream change needed; everything else runs against upstream `dev` as-is.

These notes date from the `kit-host` bring-up. The workspace now builds against the
`OctoSense-org/makepad` revision locked in `runtime.json` (`a5a3cf5b`); that `Splash` has
`OctoSense-org/makepad` revision locked in `runtime.json` (`bcb0583b`); that `Splash` has
no `isolate` field, so the kit mounts on an isolate.

## Shared runtime for OctoSense apps
Expand Down
2 changes: 1 addition & 1 deletion README.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ makepad 的原生控件(复选框、开关、单选、滑块、文本框)由

基于上游构建并运行 `kit-host` 时,只暴露出**一处**上游缺少的东西:**`Splash` 在主 VM 上挂载的选项**。上游的 `Splash` 总是分配一个 *isolate* VM(`alloc_splash_vm_with_network(allow_net)`),但浅色主题和共享堆都位于应用的**主** VM 上。修复方法是本项目的 fork 在 `widgets/src/splash.rs` 中新增的一个小字段 `isolate: false`;把它合入上游后,受信任的、由应用生成的套件就能挂载到主 VM 上(主题正确,也不会出现 isolate 堆上的 animator panic)。在此之前,套件挂载在 isolate 上(默认深色主题)。这是*唯一*需要的上游改动;其他一切都可以直接基于上游 `dev` 运行。

以上记录来自 `kit-host` 初建时期。现在本工作区基于 `runtime.json` 锁定的 `OctoSense-org/makepad` 版本(`a5a3cf5b`)构建;该版本的 `Splash` 没有 `isolate` 字段,所以套件挂载在 isolate 上。
以上记录来自 `kit-host` 初建时期。现在本工作区基于 `runtime.json` 锁定的 `OctoSense-org/makepad` 版本(`bcb0583b`)构建;该版本的 `Splash` 没有 `isolate` 字段,所以套件挂载在 isolate 上。

## OctoSense 应用的共享运行时

Expand Down
2 changes: 1 addition & 1 deletion runtime.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"repositories": {
"makepad": {
"url": "https://github.com/OctoSense-org/makepad.git",
"revision": "a5a3cf5b0dbd1b56c25defe6d98479f25843e770"
"revision": "bcb0583b50a8de8cad912e6c1505f09d8f894431"
},
"octoscript": {
"url": "https://github.com/OctoSense-org/Octoscript.git",
Expand Down