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
34 changes: 17 additions & 17 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,36 +66,36 @@ authors = ["octos-app contributors"]
# BEGIN native-apps: pins (generated by tools/native_apps.py from native-apps.json; do not edit)
rinx = { git = "https://github.com/hagency-org/Rinx.git", tag = "v1.1.0", default-features = false, features = ["octosense-module"] }
octosense-reference = { path = "apps/reference" }
makepad-sheets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "39a9de88e1af14a9d660887c453fc3102c610411", default-features = false }
makepad-terminal = { git = "https://github.com/OctoSense-org/makepad.git", rev = "39a9de88e1af14a9d660887c453fc3102c610411" }
makepad-sheets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "c155f61d0e1600d2ec474209374444a38a09a470", default-features = false }
makepad-terminal = { git = "https://github.com/OctoSense-org/makepad.git", rev = "c155f61d0e1600d2ec474209374444a38a09a470" }
octosense-appcard = { path = "apps/appcard/module" }
octosense-app-hub-app = { git = "https://github.com/OctoSense-org/OctoSense-App-Hub", rev = "58c3c8aed8fc811a16d67c5f784a8a44214ff876" }
# END native-apps: pins
# --- Makepad (OctoSense-org/makepad), the revision Octoscript-Makepad's
# runtime.json pins (native-runtime.lock.json); resolved to .sources/makepad.
makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "39a9de88e1af14a9d660887c453fc3102c610411" }
makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "c155f61d0e1600d2ec474209374444a38a09a470" }
# The script VM alone: system apps' script tests (News's main.splash).
makepad-script = { git = "https://github.com/OctoSense-org/makepad.git", rev = "39a9de88e1af14a9d660887c453fc3102c610411" }
makepad-code-editor = { git = "https://github.com/OctoSense-org/makepad.git", rev = "39a9de88e1af14a9d660887c453fc3102c610411" }
makepad-ai = { git = "https://github.com/OctoSense-org/makepad.git", rev = "39a9de88e1af14a9d660887c453fc3102c610411" }
makepad-studio-protocol = { git = "https://github.com/OctoSense-org/makepad.git", rev = "39a9de88e1af14a9d660887c453fc3102c610411" }
makepad-network = { git = "https://github.com/OctoSense-org/makepad.git", rev = "39a9de88e1af14a9d660887c453fc3102c610411" }
makepad-wm-api = { git = "https://github.com/OctoSense-org/makepad.git", rev = "39a9de88e1af14a9d660887c453fc3102c610411" }
makepad-ai-services = { git = "https://github.com/OctoSense-org/makepad.git", rev = "39a9de88e1af14a9d660887c453fc3102c610411" }
makepad-strict-json = { git = "https://github.com/OctoSense-org/makepad.git", rev = "39a9de88e1af14a9d660887c453fc3102c610411" }
makepad-app-module = { git = "https://github.com/OctoSense-org/makepad.git", rev = "39a9de88e1af14a9d660887c453fc3102c610411" }
makepad-wm-theme = { git = "https://github.com/OctoSense-org/makepad.git", rev = "39a9de88e1af14a9d660887c453fc3102c610411" }
makepad-aichat = { git = "https://github.com/OctoSense-org/makepad.git", rev = "39a9de88e1af14a9d660887c453fc3102c610411", default-features = false }
makepad-script = { git = "https://github.com/OctoSense-org/makepad.git", rev = "c155f61d0e1600d2ec474209374444a38a09a470" }
makepad-code-editor = { git = "https://github.com/OctoSense-org/makepad.git", rev = "c155f61d0e1600d2ec474209374444a38a09a470" }
makepad-ai = { git = "https://github.com/OctoSense-org/makepad.git", rev = "c155f61d0e1600d2ec474209374444a38a09a470" }
makepad-studio-protocol = { git = "https://github.com/OctoSense-org/makepad.git", rev = "c155f61d0e1600d2ec474209374444a38a09a470" }
makepad-network = { git = "https://github.com/OctoSense-org/makepad.git", rev = "c155f61d0e1600d2ec474209374444a38a09a470" }
makepad-wm-api = { git = "https://github.com/OctoSense-org/makepad.git", rev = "c155f61d0e1600d2ec474209374444a38a09a470" }
makepad-ai-services = { git = "https://github.com/OctoSense-org/makepad.git", rev = "c155f61d0e1600d2ec474209374444a38a09a470" }
makepad-strict-json = { git = "https://github.com/OctoSense-org/makepad.git", rev = "c155f61d0e1600d2ec474209374444a38a09a470" }
makepad-app-module = { git = "https://github.com/OctoSense-org/makepad.git", rev = "c155f61d0e1600d2ec474209374444a38a09a470" }
makepad-wm-theme = { git = "https://github.com/OctoSense-org/makepad.git", rev = "c155f61d0e1600d2ec474209374444a38a09a470" }
makepad-aichat = { git = "https://github.com/OctoSense-org/makepad.git", rev = "c155f61d0e1600d2ec474209374444a38a09a470", default-features = false }
# --- OctoScript (Octoscript 5991dfae) and its Makepad runtime
# (Octoscript-Makepad 62760863, native-runtime.lock.json).
# (Octoscript-Makepad 2cc5ef37, native-runtime.lock.json).
octoscript-ui-l0 = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "5991dfae9344589e732b2605b530f788e8bbcd11" }
# The bounded VM, capability-leased host modules and executable JSON schemas
# (the system toolbox's workflow templates, crates/toolbox).
octoscript-core = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "5991dfae9344589e732b2605b530f788e8bbcd11" }
octoscript-capabilities = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "5991dfae9344589e732b2605b530f788e8bbcd11" }
octoscript-schema = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "5991dfae9344589e732b2605b530f788e8bbcd11" }
octoscript-makepad = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "62760863bc992aeb7b43692b10d479417b4d3d93" }
octoscript-node = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "62760863bc992aeb7b43692b10d479417b4d3d93" }
octoscript-makepad = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "2cc5ef37d7d6a3d2992673389ce74488f7bb2d87" }
octoscript-node = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "2cc5ef37d7d6a3d2992673389ce74488f7bb2d87" }
# --- App Hub's host service registry the Mail and llm services register
# into; the same revision as App Hub's app crate (a native app, above).
octosense-appstore = { git = "https://github.com/OctoSense-org/OctoSense-App-Hub", rev = "58c3c8aed8fc811a16d67c5f784a8a44214ff876" }
Expand Down
2 changes: 1 addition & 1 deletion apps/appcard/native-runtime.lock.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"schema_version": 1,
"url": "https://github.com/OctoSense-org/Octoscript-Makepad.git",
"revision": "62760863bc992aeb7b43692b10d479417b4d3d93"
"revision": "2cc5ef37d7d6a3d2992673389ce74488f7bb2d87"
}
4 changes: 2 additions & 2 deletions native-apps.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
{
"id": "sheets",
"crate": "makepad-sheets",
"source": { "git": "https://github.com/OctoSense-org/makepad.git", "rev": "39a9de88e1af14a9d660887c453fc3102c610411", "local": ".sources/makepad/apps/sheets" },
"source": { "git": "https://github.com/OctoSense-org/makepad.git", "rev": "c155f61d0e1600d2ec474209374444a38a09a470", "local": ".sources/makepad/apps/sheets" },
"module": "makepad_sheets::SHEETS_MODULE",
"bin": "sheets",
"bin_features": ["standalone"],
Expand All @@ -58,7 +58,7 @@
{
"id": "terminal",
"crate": "makepad-terminal",
"source": { "git": "https://github.com/OctoSense-org/makepad.git", "rev": "39a9de88e1af14a9d660887c453fc3102c610411", "local": ".sources/makepad/apps/terminal" },
"source": { "git": "https://github.com/OctoSense-org/makepad.git", "rev": "c155f61d0e1600d2ec474209374444a38a09a470", "local": ".sources/makepad/apps/terminal" },
"module": "makepad_terminal::TERMINAL_MODULE",
"bin": "terminal",
"default_features": true,
Expand Down
2 changes: 1 addition & 1 deletion native-runtime.lock.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"schema_version": 1,
"url": "https://github.com/OctoSense-org/Octoscript-Makepad.git",
"revision": "62760863bc992aeb7b43692b10d479417b4d3d93"
"revision": "2cc5ef37d7d6a3d2992673389ce74488f7bb2d87"
}
4 changes: 2 additions & 2 deletions phone/docs/build-tool.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ move that touches `tools/cargo_makepad` is the usual trigger):
cargo install --path .sources/makepad/tools/cargo_makepad --force
```

The shared release selects Makepad main `39a9de88`, which includes App Hub's
The shared release selects Makepad main `c155f61d`, which includes App Hub's
isolate containment (#22), contained script apps (#30), the QR scanner
(#31), Splash `reapply_text` (#35) self-confirmed assistant tools (#36) and the one-call-site Slug, cursor and glass shaders (#37, #39), the terminal's confirmed runs (#41), trackpad scrolling (#42), gestures (#46), Chinese text (#48), tabs and installed fonts (#47), and every app's system-font fallback (#49, #51), WebReader's close ending the page (#43), the OpenHarmony packager's workspace target dir (#52), the `sys.dataset` and `sys.news_digest` helpers (#53) the peer-link client (#54), the Linux Vulkan build (#45), the map's hosted-archive source (#55) HTTPS on OpenHarmony (#56) the keyboard's hide after a cancelled search (#57, #59) and the terminal's tab titles, wide-character reflow, non-blocking PTY writes, control-request timeout and running-job close confirmation (#61–#65), and its grapheme clusters, Kitty keyboard and synchronized output, close handshake and rendering polish (#66–#69), text shaping and drag-select (#70–#72), clickable links and scrollback search (#73, #74), keyboard shortcuts (#76) and OpenHarmony run (#91), GL GPU timing (#81), atlas text on phones (#82), the Android touch-down power hint (#83) and Vulkan without a debug messenger (#92), Linux GL remote grabs (#93), a hidden map's idle frame loop (#79), and OpenHarmony's keyboard, Studio, GL lifetimes and idle frames (#84, #85, #87–#89); the consumer lock
(#31), Splash `reapply_text` (#35) self-confirmed assistant tools (#36) and the one-call-site Slug, cursor and glass shaders (#37, #39), the terminal's confirmed runs (#41), trackpad scrolling (#42), gestures (#46), Chinese text (#48), tabs and installed fonts (#47), and every app's system-font fallback (#49, #51), WebReader's close ending the page (#43), the OpenHarmony packager's workspace target dir (#52), the `sys.dataset` and `sys.news_digest` helpers (#53) the peer-link client (#54), the Linux Vulkan build (#45), the map's hosted-archive source (#55) HTTPS on OpenHarmony (#56) the keyboard's hide after a cancelled search (#57, #59) and the terminal's tab titles, wide-character reflow, non-blocking PTY writes, control-request timeout and running-job close confirmation (#61–#65), and its grapheme clusters, Kitty keyboard and synchronized output, close handshake and rendering polish (#66–#69), text shaping and drag-select (#70–#72), clickable links and scrollback search (#73, #74), keyboard shortcuts (#76) and OpenHarmony run (#91), GL GPU timing (#81), atlas text on phones (#82), the Android touch-down power hint (#83) and Vulkan without a debug messenger (#92), Linux GL remote grabs (#93), a hidden map's idle frame loop (#79), and OpenHarmony's keyboard, Studio, GL lifetimes and idle frames (#84, #85, #87–#89), a library target and an own agent for each Makepad app OctoSense makes native (#94, #95), hosted Notes and Reminders that start empty (#96), Files' read-only chat panel (#97) and a CEF profile under `MAKEPAD_HOME` (#98); the consumer lock
needs no `makepad_override`.

To see which checkout an installed tool reads its Java from:
Expand Down
9 changes: 6 additions & 3 deletions phone/docs/makepad-fork.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ Makepad and that no fork is required do not.
The revision is pinned as a chain, not in one place:

1. `native-runtime.lock.json` here names one revision of
`OctoSense-org/Octoscript-Makepad` (`62760863`, its main).
`OctoSense-org/Octoscript-Makepad` (`2cc5ef37`, its main).
2. That repo's `runtime.json` names the Makepad fork revision
(`39a9de88`, Makepad main: the enforced isolate policy of PR #22, module
(`c155f61d`, Makepad main: the enforced isolate policy of PR #22, module
windows, the ROM's Splash fixes, the contained script apps and host
services of PR #30, the QR scanner of PR #31, Splash `reapply_text` of
PR #35, the self-confirmed assistant tools of PR #36, the one-call-site
Expand All @@ -43,7 +43,10 @@ The revision is pinned as a chain, not in one place:
touch-down power hint of PR #83 and Vulkan without a debug messenger of
PR #92, Linux GL remote grabs of PR #93, a hidden map's idle frame loop of
PR #79, and OpenHarmony's keyboard, Studio, GL lifetimes and idle frames
of PRs #84, #85 and #87–#89) and the
of PRs #84, #85 and #87–#89, a library target and an own agent for each
Makepad app OctoSense makes native of PRs #94 and #95, hosted Notes and
Reminders that start empty of PR #96, Files' read-only chat panel of
PR #97 and a CEF profile under `MAKEPAD_HOME` of PR #98) and the
Octoscript revision
(`5991dfa`, with the L0 `sys.digest` source of Octoscript #40). OctoSense, AppCard, Rinx and the ROM lock the same release.
3. The manifests repeat the Makepad revision as `rev = "…"`: here in
Expand Down
4 changes: 2 additions & 2 deletions runtime-patches.lock.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"schema_version": 1,
"makepad": {
"base_revision": "39a9de88e1af14a9d660887c453fc3102c610411",
"base_revision": "c155f61d0e1600d2ec474209374444a38a09a470",
"patch": "tools/runtime-patches/makepad-settings.patch",
"sha256": "b17352ebf59e50ab3db6ff1cb825c4e006bcdff47d83522e372b8fe585e57570",
"tree": "976bf55b6b94ae145f941f9aa39ca2b1036352ec",
"tree": "3eadf628ee75eb4c9b672446bf14c7b95d9f0f5b",
"product_fixes": [
"Settings integration: Android IME synchronization, accessibility and reduced motion, GLES program-cache validation, obscured-gesture cancellation and scroll-position observation.",
"Contained-app isolation and secret-input restrictions come from the pinned upstream runtime; the Settings overlay preserves those gates.",
Expand Down
Loading