The Makepad Builder (tools/makepad_builder: the Windows download is makepad-builder.zip with the Builder's source; macOS and Linux run makepad.sh), the CI runner (tools/ci), cargo-makepad, the agents tool, the root workspace and the documents. Covers work 6f1e44649..2b1a41df4 outside platform, draw, widgets, libs, apps and examples: - wm: the Android super-app compiles tiles on the phone against the host engine - cargo-makepad: the super-app APK is packed by `android dyn-pack`, in Rust - widgets, storybook: the widget catalogue app, some eighty new widgets, a theme store with mixable style sheets, and the rule that a press belongs to - wm, widgets: the style tween starts with all eight weights, and the new style sheet takes the last number instead of macOS's - platform: the Android desk swipes at 120 Hz — offscreen render passes and framebuffers cached, SVG meshes kept, font families that complete - cef: a page's audio can be captured instead of played - Button: activate from the keyboard when focused (#1241) - libs/ai: exclude hub_ui and services from the AI workspace (#1242) - flow: the flow-ui app and the flowgraph canvas return to the workspace, with staged progress in libs/flow - svg: a stroke that bends tighter than its half width collapses its inner edge to the corner - the accent a name is written with stops deciding whether search finds it - macOS: keep the paint clock beating while the window is minimized (#1244) - Linux: only link libdrm for the direct backend (#1245) - cargo-makepad: find dependency crate dirs via cargo metadata (#1246) - app_main!: only ship the fonts an app declares (#1247) - ai stems: LaneDemixer, VocalsModel and the platform Stage origin/main needs - platform, widgets, wm: every Vulkan pass renders through a negative-height viewport again, so a Wayland or X11 window stands upright, and no capture - calendar: its own colour contrast is named explicitly, now that the theme store exports one under the same name through the widgets glob - widgets: the supersampled resolve and the map's shadow mask sample their textures as stored, like every other render texture - platform: every OpenGL texture pass stores top-left rows, custom cameras included, and culls with the winding its inverted projection gives - platform, wm, director: a hosted app's software frame arrives as a top-left texture and the window manager and the director carry no flip term at al - widgets, platform: the last twelve warnings go - The Builder compiles itself again from the Makepad tree Scope's release pins and removes the source snapshots nothing is built from any more - The regex engine accepts \b and \B, reports the earliest match so a scan can resume after it, and can decide word boundaries on ASCII so a code sear - workspace: Scope's settings carry the code map's tab width and the directories each prepared project hides from its map - AGENTS.md: a platform change made for one application needs the user's feedback and checks first, and app specifics never leak into the shared layer - wm: the desktop style menu lists each style once - cef, video, platform: what Stage's browser needs from the shared layers - macOS: re-arm the display links when a window leaves the Dock (#1251) - platform, wm: work builds again on iOS, tvOS and wasm, and the window manager is warning-free on Windows - ci: tools/ci, a Splash runtime that watches a branch and runs every ci.splash it finds - stitch: the crate says what the rest of the repository says about its license - ci: a run is one target dir and one cargo batch per target, and the wall draws - ci: the wall shows THIS run and is fit for an OLED - ci: untested is grey and nothing else - ci: warming fills the cache and blames nobody - Vulkan: stop printing the loader's startup narration by default (#1252) - ci: the terminal gets its pty helper, director is a desktop tool, and a refused input is asked again - platform: no warnings on tvOS and linux_direct, and a missing pty helper says so - apps: what the CI box found - ScrollBar: add `show_handle` for a view that scrolls without a grabbable bar (#1254) - cargo-makepad: keep the android SDK at a stable path (#1253) - ci: the window is a dashboard - Remove Flow, asset and VJ applications moved into Stage - ci: a stop or a restart is not a test result - ci: a quiet header, a build that visibly moves, and scripts that leave the machine alone - widgets: children a lookup discovers reach the dump, the snapshot and the flood searches - tests: the workspace suite, run as a whole for the first time, passes outside the example UI tests - platform: a hidden window wears no hands-off frame - examples: the UI tests pass, for the reasons they failed - ci: a library's warnings turn the workspace block yellow, and a desktop tool is not warmed for the web - libs: no warnings in the workspace check on any row - ci: the workspace script gives the wall back after warming - ci: a judgement is never lost to the way it was phrased, and every "retry" of the bridge is retried - tests: the last three failures of the CI box's night - Linux: fix window chrome button hovers and how maximized/fullscreen windows work (#1255) - ci: the header names the tip being tested - tools: makepad-screen is makepad-agents, and its binary is `agents` - gif: the crate's doc examples compile - ci: the tests are the platform's own, in release, in two minutes - Tooltip: position anchored tooltips in the same draw (#1256) - cef: a hosted browser survives its host's exit - ci: a card is as high as its content - tests: the three binaries over ten seconds in release come under it - widgets: let the host install script mods into every Splash isolate - widgets: a pooled test context forgets the last case's Escape claim - widgets: the pooled test context's resets replace the globals - wm: the shell menu says what it did, and the CI waits for that - platform: the storage module says how much a volume has free - git: the memory ledger can take what it is asked for - ci: a driven app takes every key once, and the storage module builds for the browser - RadioButton: fix its touch hover state and click-off behavior (#1258) - HtmlLink: fix its hover and pressed states (#1257) - RadioButton: take key focus on the click, not on the press (#1259) - script: re-entrant dispatch, thread index validation, Any-based handle downcasts, UTF-8 previews; regex: never_loop fix - script: port Octoscript WS1 — worklist equality with fuel/deadline/work bail, uncaught-error bail, allow_debug_output - script: port Octoscript parser/tokenizer/control-flow VM patches (ws2) - script: port Octoscript heap/string/array/object hardening onto upstream's allocation budget - script: port orphaned Octoscript VM hardening (execution caps, clear_type_methods, parser diagnostics) - script: keep silenced streaming evals running past uncaught errors - script: the Octoscript hardening keeps a Makepad host's semantics and its speed - fix(text): enable ttf-parser gvar-alloc for many-tuple variable fonts - feat(text): CoreText outline fallback for hvgl-only fonts (macOS) - draw text: the CoreText outline fallback is only ever resolved for a face whose outlines live solely in hvgl, and font-family diagnostics are the `f - mail: the phone layout lines up - clock: the phone layout fits both orientations - calendar, reminders, calculator, sheets: the phone layouts fit their space - platform, widgets, wm: a touch that is taken away is cancelled, never released - weather, notes, finance, photos, route: the phone layouts tidy up - files: the phone layout tidies up - wm: the phone shell's surfaces match the app and the grid - wm on Android: every app is its own process - clock: a cancelled release neither opens an alarm nor switches tab - platform, wm: hosted apps ask the WM for what they cannot do themselves - wm on Android: apps build on the phone - wm on Android: app transitions and gestures feel like the phone's - android: rotated Vulkan windows stop rebuilding their swapchain every frame, and hosted children get touch - vulkan (android): a window released on suspend is not released again - android: hosted children hand frames over with GPU fences and draw only when they have work - wm on Android: gestures and surfaces settle like the phone's - widgets: touch lists scroll with Android's physics - wm on Android: the shell follows the Pixel launcher's motion - wm on Android: Recents shows the apps over a receding home, and the home screen switches looks - wm on Android: the look switcher stays put, the iOS dock shows its icons, background apps follow a look change - task, cargo-makepad, widgets, audio: the task manager chooses its columns, graphs every process' network and disk traffic and installs itself as a D - agents: a user touching an app under test no longer stops the agent - flowgraph: ordered ports take many wires, sockets can override their icon, and the canvas embeds as a viewport - cef: captured frames and audio carry callback clocks and a navigation epoch - git: timings read a portable clock - ai: the hub's rig-fixture tests find the asset library without the asset client - ai llm: a Metal main buffer is filled in 32 MB chunks - diskmap: a scan lists each macOS directory in one getattrlistbulk call and classifies files without allocating or locking - files: the tile view's three projections are toolbar buttons - mail: the local view takes a theme-derived palette and line icons, search pages share records - director: agent lanes form a tree and Grok joins the usage bar - widgets, draw: skeuomorphic surfaces light each other through an optional relief buffer - widgets, platform: a texture can light the relief buffer, menus take colour chips, and a style reload recompiles changed shader functions - widgets: relief surfaces can travel like mechanical keys, and dark surfaces take less neighbour light - platform, widgets, audio_route, ai: window crossfades and whole-frame presents, caption controls that click, themed menus, a stereo-pair audio tap, - builder: the Builder TUI matches the new terminal design, Windows executables carry app icons, and every app has one - platform: Android builds without Vulkan compile again, and the font-selection test counts the hosted entry point - platform: the pipeline-skip repaint mark exists only on Apple, where Metal reads it - builder: the terminal scripts delete nothing and read top to bottom, and every Builder delete stays inside its own folder - files: the Files app deletes nothing and never overwrites - director: coding agents ask before acting unless you choose otherwise - sheets, score, git, home: saves cannot cut a file short or overwrite another one, and checkouts cannot write outside the repository - git: worktree status matches git on real repositories and can be cancelled - builder: one forward-only bar per setup component, green checks on finished setup rows, a black Builder window and a smaller Windows ZIP - builder: the GPU notice is remembered - cuda: builds link only the CUDA toolkit they are given, never a system install - builder: a refused email opens the editor again with what was typed and says why, and the app section is YOUR APPS - builder: a refused email says "Email not recognised" and keeps what was typed for fixing - platform (windows): every window keeps animating with several windows open - builder previews: long work gets a page of its own (steps as a checklist, the current one carrying its bar, footer working · ctrl+c stops), Account - builder: long work runs on its own page - builder: a first build resolves online, the Rust row and bars move when the work does, and the window fits the TUI - audio_route: one API on macOS, Windows and Linux, monitoring by default and processing only when asked, plus shaders that discard a value compile to - platform, widgets, ai: a restyle recompiles nothing it already has, shows only complete frames, and a window can own its caption - builder: Compile shows a real bar - builder: the compile line is the bar and n / total crates - builder: apps get the icon their package declares - builder: no Scope command - widgets: relief surfaces can swing their light toward a point - builder: a HEAD request is a HEAD - builder: the menu waits for a choice - builder: no menu flash after log-in - builder: wait out Windows security on fresh Rust - builder: the menu opens on the first of YOUR APPS - platform (windows): half-float RGBA textures have four channels - builder: CUDA whenever the machine has NVIDIA - audio_route example: print the samples that reached the processor each second - widgets, builder: the big widget families are features, all on by default, and the Builder takes none of them - platform (macos): the display link is kept until it is invalidated - ai hub: a local chat with no model says so once, plainly - builder: the Windows exe is built for size - windows: desktop apps open no console window, and still speak through pipes - ai: Claude Desktop drives any app with the F10 panel - Constrain Splash external I/O to the host service bridge (#1243) - PortalList: stop following the end when scrolling to an earlier item (#1261) - wm: starts on Windows - ci: a full disk empties the build output before the run, not every row after it - builder: an incremental compile's bar follows what really compiles - builder: the compile bar's total is the app's own crates - builder: menus wrap around - wm: children open no console windows on Windows - wm: the whole deck out of a Builder's source, compiled only when the person opens an app - builder: CUDA crates build in an installation whose path has a space - ai: Connect hands the .mcpb to Claude Desktop itself - wm: the clock and calendar know the date on Windows - platform (windows): a popup opened for the first time draws its rows - wm: opening an app rebuilds it when its binary is out of date; warm instances never build - builder: an app edited after its build shows as needing a compile - civil-time: one local wall clock for every app, and it knows the zone on Windows - platform + wm: a hosted child redraws at its tile's new size - platform (windows): a texture pass drawn before its window has a size is skipped, not a crash - draw: glass of a view that stopped drawing leaves the screen - calendar: the Calendars sheet is an opaque panel, and the wide layout does not float one over its sidebar - build: dev keeps line tables only, release is incremental without LTO, the parallel frontend is a documented local opt-in - cargo-makepad: a binary with several app_main! entry points bundles - script: #[derive(Script)] emits one helper call per field, and ScriptNew's default methods keep their bodies out of every type - widgets: the Widget lookup methods and with_script_vm_id are compiled once, not once per widget type - platform: studio-protocol no longer waits for script, so platform starts ~0.5 s earlier - ai-speech: makepad-ai-sfx (and with it ai-h3) is built only for IndexTTS - platform: an app's package dir, icons and bundle name rebuild only that app - script + wasm_bridge: no build script that reruns on every file - build: a private app cloned into apps/<name> joins this workspace, Stage first - build: the AI stack, csg, Scope and Source Library join the one workspace - builder: every app builds in the one Makepad workspace, one target directory per source snapshot - ai chat: the chat's backends are the CLI, MCP and cloud providers; the local model is the `localai` feature - apps: every app that hosts the chat has a `localai` feature for the local model, off unless the app's own job runs one - builder: time each install component and phase - builder: Build tools, Windows SDK, Rust and CUDA install side by side, each with its own bar - builder bootstrap: rustc, rust-std and cargo download and unpack side by side under one Rust bar - widgets: the library moves to makepad-widgets-core in widgets/core, and makepad-widgets becomes its front crate - widgets: the Window, widget tree and panel theme reach the tweaker, voice, AI slot and dock through hooks, not through their modules - widgets: every widget family is a crate of its own under widgets/families, and makepad-widgets links, re-exports and registers the ones its features - aichat, widgets: the chat reads the design feedback through the tweaker's hook, so linking the chat no longer needs the tweaker - apps, examples, libs: each crate builds only the widget families it uses, and the design overlay is each app's own default feature - builder: an app release builds without the app's development defaults, and the catalog names every feature a release ships with - widgets: the build scripts rerun on their own edits only, and makepad-widgets no longer reads MAKEPAD - livepipe: takes makepad-widgets without its default families, now that the AI stack is in the one workspace - builder: the catalog names the new localai defaults of route and ai-hub - feedback: Send feedback, a caption icon and a small panel that shows exactly what is sent - builder: an app it launches knows who the person is, for Send feedback - feedback: the panel's wording reads right and draws in any font - feedback: takes makepad-widgets without its default families - builder: clear build data deletes target/ itself and says why when it cannot - ai chat: a build without local AI starts on the first provider that answers here, not on "No model" - platform: MAKEPAD=gpusim builds again - cargo-makepad: a Windows desktop build links the app's icon into its own binary, not into RUSTFLAGS - thiserror: RUSTC_BOOTSTRAP no longer turns on the unstable generic member access API - builder: every end-user build uses rustc's parallel frontend, and falls back to one thread when it fails - builder: the Windows SDK downloads the 25 cabinets its MSIs name instead of all 149, no screen or log shows a \\?\ path, long status messages wrap, - builder: CUDA kernels compile in any install folder, and when they cannot the app is built without them - builder: makepad-builder.exe declares itself like a well-formed Windows program and stops a stalled build through a job object instead of taskkill - platform (macos): a contained panic no longer frees the windows under AppKit or leaves an app that ignores quit - builder: macOS and Linux run the Builder as one shell script, the same TUI as Windows, and nothing is compiled for it - builder + ai-cuda: the CUDA kernel progress shows in the Builder's Compile row, not scribbled over its screen - builder: an app built with CUDA starts on Windows - builder (windows): the downloaded exe is built large again - builder (unix): the email check takes real addresses - repo: no third-party comic archive, generated models or sample asset in the tree - remove big example media files - cargo_makepad: no stray KNMI radar frame in the Android Java sources - widgets: the empty parts of an app's caption bar drag the window again - ScrollBar: fade out when idle, like macOS overlay scrollers (#1264) - platform: every app builds the same `windows` crate - wm: in a Makepad Builder installation apps build through the Builder, however wm was started - platform, draw: web builds start again - platform: web text draws again - widgets: the keyboard reaches boxes and modals - widgets: a hover tooltip never sits under the mouse cursor - platform: clipboard_read, reading text or an image from the system clipboard - feedback: Send clipboard, and the dialog works from the keyboard - builder: the Windows Builder ships as source, runs in its own console, and apps compile with Rust's GNU toolchain or Microsoft's - platform: an app also finds its resource map in the builder folder beside it - win_resource: PNG decode and encode on makepad-fast-inflate instead of zune-png - builder: one folder layout everywhere, makepad-builder.zip with only the files a Windows build reads, a Rust download over parallel connections, and - builder (windows): the .bat runs from a folder with spaces and parentheses, and the ZIP always carries it with CRLF - builder: coding agents start from the macOS/Linux Builder, its compile bar has its end, the app rows say where each app is in a word or two, and Win - builder (unix): running curl | sh again opens the existing installation with its saved email - builder: log out from the Account row - builder: `makepad-builder build APP` compiles an app offline exactly as the Builder does Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
280 lines
12 KiB
Bash
280 lines
12 KiB
Bash
#!/bin/sh
|
|
# Makepad Builder bootstrap (macOS and Linux).
|
|
#
|
|
# Runs from the Builder folder and gets the Builder going:
|
|
# 1. check the system build tools (check-tools.sh)
|
|
# 2. pick a Rust compiler (yours, or a private copy here)
|
|
# 3. fetch the public Makepad source (one pinned commit, verified)
|
|
# 4. compile the Builder and start it
|
|
#
|
|
# Safe to run again at any time: each step looks at what is already here.
|
|
# It never deletes anything. Downloads go to fixed names that the next run
|
|
# overwrites, and each finished step is moved into place with one rename.
|
|
# Everything stays inside this folder; nothing outside it is changed.
|
|
set -eu
|
|
|
|
# Pinned by the download service; the Builder updates these four lines
|
|
# (they must stay exactly in this form).
|
|
builder_rust='@RUST_VERSION@'
|
|
builder_commit='@MAKEPAD_COMMIT@'
|
|
builder_release='@RELEASE_ID@'
|
|
builder_receipt='@MAKEPAD_RECEIPT@'
|
|
|
|
say() { printf ' %s\n' "$*"; }
|
|
step() { printf '\n %s\n' "$*"; }
|
|
fail() { printf '\n %s\n\n' "$*" >&2; exit 1; }
|
|
|
|
# --- Where we are -----------------------------------------------------------
|
|
|
|
root=$(cd -P -- "$(dirname -- "$0")" && pwd -P) || fail 'Could not find the Builder folder.'
|
|
home=$(cd -P -- "$HOME" && pwd -P) || fail 'Could not find your home folder.'
|
|
case "$root" in
|
|
/|"$home") fail "The Builder needs a folder of its own, not $root. Download it again and choose a folder such as ~/makepad-commercial." ;;
|
|
esac
|
|
|
|
case "$(uname -s)/$(uname -m)" in
|
|
Darwin/arm64 | Darwin/aarch64) triple=aarch64-apple-darwin ;;
|
|
Darwin/x86_64) triple=x86_64-apple-darwin ;;
|
|
Linux/x86_64) triple=x86_64-unknown-linux-gnu ;;
|
|
Linux/aarch64 | Linux/arm64) triple=aarch64-unknown-linux-gnu ;;
|
|
*) fail 'The Builder supports macOS, and glibc Linux on x86_64 and ARM64.' ;;
|
|
esac
|
|
|
|
export MAKEPAD_LOADER_ROOT="$root"
|
|
private_rust="$root/toolchain/rust/$builder_rust-$triple"
|
|
builder_stamp="$builder_commit $builder_rust $triple"
|
|
|
|
# --- Small helpers ----------------------------------------------------------
|
|
|
|
sha256() {
|
|
if command -v sha256sum >/dev/null 2>&1; then sha256sum "$1" | awk '{ print $1 }'
|
|
else shasum -a 256 "$1" | awk '{ print $1 }'; fi
|
|
}
|
|
|
|
# download URL FILE: HTTPS only, no redirects, into FILE.part, then renamed
|
|
# to FILE. A failed or interrupted download leaves only FILE.part behind,
|
|
# which the next attempt overwrites.
|
|
download() {
|
|
curl --fail --show-error --progress-bar --proto '=https' --tlsv1.2 \
|
|
--output "$2.part" "$1" || fail "Download failed: $1"
|
|
mv -f "$2.part" "$2"
|
|
}
|
|
|
|
# The recorded compiler choice: "private", the sysroot of your own Rust, or
|
|
# nothing yet. Delete selected-rust to be asked again.
|
|
recorded_rust() { cat "$root/selected-rust" 2>/dev/null || :; }
|
|
record_rust() {
|
|
printf '%s\n' "$1" > "$root/selected-rust.new"
|
|
mv -f "$root/selected-rust.new" "$root/selected-rust"
|
|
}
|
|
|
|
# rust_check --probe | --validate SYSROOT: prints a usable sysroot, or
|
|
# returns non-zero with the reason in $rust_reason. Read-only.
|
|
rust_check() {
|
|
rust_reason=
|
|
if rust_sysroot=$(sh "$root/rust-tools.sh" "$1" "$builder_rust" "$triple" ${2:+"$2"} 2>/dev/null); then
|
|
return 0
|
|
fi
|
|
rust_reason=$rust_sysroot
|
|
rust_sysroot=
|
|
return 1
|
|
}
|
|
|
|
private_rust_ready() {
|
|
[ "$(cat "$private_rust/.toolchain-version" 2>/dev/null || :)" = "$builder_rust $triple" ] &&
|
|
[ -x "$private_rust/bin/rustc" ] && [ -x "$private_rust/bin/cargo" ]
|
|
}
|
|
|
|
# macOS: rust-objcopy (used to strip release builds) finds LLVM beside
|
|
# rustlib's host tools. A relative link keeps the folder movable.
|
|
prepare_host_tools() {
|
|
case "$triple" in
|
|
*-apple-darwin)
|
|
host_lib="$1/lib/rustlib/$triple/lib"
|
|
if [ -f "$1/lib/libLLVM.dylib" ] && [ ! -e "$host_lib/libLLVM.dylib" ]; then
|
|
mkdir -p "$host_lib"
|
|
ln -s ../../../libLLVM.dylib "$host_lib/libLLVM.dylib"
|
|
fi ;;
|
|
esac
|
|
}
|
|
|
|
start_builder() {
|
|
prepare_host_tools "$1"
|
|
exec "$root/makepad-builder" tui
|
|
}
|
|
|
|
# --- Fast path: everything is already here ----------------------------------
|
|
|
|
if [ -x "$root/makepad-builder" ] && [ "$(cat "$root/.builder-version" 2>/dev/null || :)" = "$builder_stamp" ]; then
|
|
choice=$(recorded_rust)
|
|
case "$choice" in
|
|
private) private_rust_ready && start_builder "$private_rust" ;;
|
|
/*) rust_check --validate "$choice" && start_builder "$rust_sysroot" ;;
|
|
esac
|
|
fi
|
|
|
|
# --- 1. System build tools --------------------------------------------------
|
|
|
|
step '1/4 System build tools'
|
|
sh "$root/check-tools.sh"
|
|
mkdir -p "$root/cache" "$root/toolchain/rust" "$root/cargo-home" "$root/target" "$root/tmp"
|
|
|
|
# --- 2. Rust ----------------------------------------------------------------
|
|
|
|
step '2/4 Rust'
|
|
choice=$(recorded_rust)
|
|
case "$choice" in
|
|
/*)
|
|
if ! rust_check --validate "$choice"; then
|
|
say "Your Rust at $choice can no longer be used: $rust_reason"
|
|
say 'Using a private Rust in this folder instead.'
|
|
choice=
|
|
fi ;;
|
|
esac
|
|
if [ -z "$choice" ] && rust_check --probe; then
|
|
say "Found $("$rust_sysroot/bin/rustc" --version)."
|
|
say 'Use it, or a private Rust in this folder that keeps your system clean?'
|
|
printf ' Type system, or press Return for private: '
|
|
IFS= read -r answer || answer=
|
|
case "$answer" in
|
|
s | system) record_rust "$rust_sysroot" ; choice=$rust_sysroot ;;
|
|
*) record_rust private ;;
|
|
esac
|
|
fi
|
|
[ -n "$choice" ] || record_rust private
|
|
|
|
if [ "$(recorded_rust)" = private ]; then
|
|
if ! private_rust_ready; then
|
|
say "Installing a private Rust $builder_rust into this folder (about 70 MB from static.rust-lang.org)."
|
|
say 'Rust licenses: https://www.rust-lang.org/policies/licenses'
|
|
printf ' Press Return to continue, or Ctrl+C to stop. '
|
|
IFS= read -r answer || fail 'Stopped. Nothing was installed.'
|
|
|
|
# The three components are unpacked into a staging folder, checked,
|
|
# then renamed into place. A stopped run leaves the staging folder,
|
|
# which the next run unpacks over.
|
|
manifest="$root/cache/channel-rust-$builder_rust.toml"
|
|
download "https://static.rust-lang.org/dist/channel-rust-$builder_rust.toml" "$manifest"
|
|
staging="$root/toolchain/rust/.staging-$builder_rust-$triple"
|
|
mkdir -p "$staging"
|
|
for component in rustc rust-std cargo; do
|
|
section="[pkg.$component.target.$triple]"
|
|
field() {
|
|
awk -v section="$section" -v key="$1" '
|
|
$0 == section { inside = 1; next }
|
|
/^\[/ { inside = 0 }
|
|
inside && $1 == key && $2 == "=" { gsub(/"/, "", $3); print $3; exit }
|
|
' "$manifest"
|
|
}
|
|
url=$(field url)
|
|
hash=$(field hash)
|
|
case "$url" in https://static.rust-lang.org/dist/*.tar.gz) ;; *) fail "Unexpected Rust download address for $component." ;; esac
|
|
case "$hash" in *[!0-9a-f]* | '') fail "Invalid Rust checksum for $component." ;; esac
|
|
[ "${#hash}" = 64 ] || fail "Invalid Rust checksum for $component."
|
|
|
|
archive="$root/cache/$hash.tar.gz"
|
|
if [ ! -f "$archive" ] || [ "$(sha256 "$archive")" != "$hash" ]; then
|
|
say "Downloading $component"
|
|
download "$url" "$archive"
|
|
[ "$(sha256 "$archive")" = "$hash" ] || fail "The $component download does not match its checksum."
|
|
fi
|
|
# An official archive holds <name>/<component>/{bin,lib,...};
|
|
# unpack only that inner folder.
|
|
top=$(basename "$url" .tar.gz)
|
|
case "$component" in rust-std) inner=rust-std-$triple ;; *) inner=$component ;; esac
|
|
say "Unpacking $component"
|
|
tar -xzf "$archive" -C "$staging" --strip-components=2 "$top/$inner"
|
|
done
|
|
prepare_host_tools "$staging"
|
|
case "$("$staging/bin/rustc" --version)" in
|
|
"rustc $builder_rust "*) ;;
|
|
*) fail 'The private Rust did not pass its version check.' ;;
|
|
esac
|
|
"$staging/bin/cargo" --version >/dev/null
|
|
printf '%s' "$builder_rust $triple" > "$staging/.toolchain-version"
|
|
[ ! -e "$private_rust" ] || fail "An unfinished toolchain is in the way: $private_rust. Move it aside and run the Builder again."
|
|
mv "$staging" "$private_rust"
|
|
fi
|
|
rust_sysroot=$private_rust
|
|
say "Private Rust $builder_rust is ready."
|
|
else
|
|
rust_sysroot=$(recorded_rust)
|
|
say "Using your Rust at $rust_sysroot."
|
|
fi
|
|
prepare_host_tools "$rust_sysroot"
|
|
|
|
# --- 3. Makepad source ------------------------------------------------------
|
|
|
|
step '3/4 Makepad source'
|
|
sources="$root/sources/$builder_release"
|
|
source_dir="$sources/makepad"
|
|
receipt_file="$sources/.builder-repositories/makepad"
|
|
mkdir -p "$sources/.builder-repositories" "$root/available"
|
|
if [ ! -d "$source_dir" ]; then
|
|
# One commit from our verified pack, checked out in a staging folder and
|
|
# renamed into place once git has verified it.
|
|
pack="$root/cache/makepad-$builder_release.pack"
|
|
say 'Downloading the public Makepad source'
|
|
download "https://makepad.nl/api/loader/public/source/$builder_release/makepad.pack" "$pack"
|
|
[ "$(sha256 "$pack")" = "${builder_receipt#* }" ] || fail 'The Makepad source does not match its checksum.'
|
|
staging="$sources/.staging-makepad"
|
|
git init -q "$staging"
|
|
git -C "$staging" config remote.origin.url https://github.com/makepad/makepad.git
|
|
git -C "$staging" index-pack --stdin < "$pack" >/dev/null
|
|
printf '%s\n' "$builder_commit" > "$staging/.git/shallow"
|
|
git -C "$staging" -c advice.detachedHead=false checkout -q -f --detach "$builder_commit"
|
|
[ "$(git -C "$staging" rev-parse HEAD)" = "$builder_commit" ] || fail 'The Makepad source is not the expected commit.'
|
|
git -C "$staging" fsck --no-reflogs --no-progress >/dev/null
|
|
mv "$staging" "$source_dir"
|
|
printf '%s' "$builder_receipt" > "$receipt_file"
|
|
elif [ "$(cat "$receipt_file" 2>/dev/null || :)" != "$builder_receipt" ]; then
|
|
fail "$source_dir was not made by this Builder and is left as it is. Choose another folder."
|
|
fi
|
|
printf '%s\n' @RELEASE_SHELL@ > "$root/available/@MANIFEST_APP@.json"
|
|
say 'Source is ready.'
|
|
|
|
# --- 4. Compile the Builder -------------------------------------------------
|
|
|
|
step '4/4 Builder'
|
|
# The chosen compiler comes first on PATH; caches, build output and temp
|
|
# files stay in this folder. No rustup proxy can install or switch anything.
|
|
export PATH="$rust_sysroot/bin:$PATH"
|
|
export CARGO_HOME="$root/cargo-home"
|
|
export CARGO_TARGET_DIR="$root/target"
|
|
export RUSTUP_HOME="$root/rustup-home"
|
|
export RUSTUP_AUTO_INSTALL=0
|
|
export RUSTC="$rust_sysroot/bin/rustc"
|
|
export TMPDIR="$root/tmp"
|
|
export MAKEPAD_GGML_NO_CUDA=1
|
|
unset RUSTUP_TOOLCHAIN RUSTC_WRAPPER RUSTC_WORKSPACE_WRAPPER CARGO_ENCODED_RUSTFLAGS RUSTFLAGS RUSTDOC
|
|
if [ -x "$rust_sysroot/bin/rustdoc" ]; then export RUSTDOC="$rust_sysroot/bin/rustdoc"; fi
|
|
|
|
if [ "$(cat "$root/.builder-version" 2>/dev/null || :)" = "$builder_stamp" ] && [ -x "$root/makepad-builder" ]; then
|
|
say 'Already compiled for this release.'
|
|
else
|
|
# One counting line instead of cargo's crate list; the full output is in
|
|
# build.log.
|
|
say 'Compiling (about a minute; the full log is in build.log)'
|
|
(
|
|
cd "$source_dir"
|
|
status=0
|
|
cargo build --release -p makepad-loader --no-default-features --bin makepad-builder-cli \
|
|
> "$root/build.log" 2>&1 || status=$?
|
|
exit "$status"
|
|
) &
|
|
compile=$!
|
|
while kill -0 "$compile" 2>/dev/null; do
|
|
crates=$(grep -c '^ *Compiling ' "$root/build.log" 2>/dev/null) || :
|
|
printf '\r %s crates compiled' "${crates:-0}"
|
|
sleep 1
|
|
done
|
|
printf '\n'
|
|
wait "$compile" || fail "Compiling failed; see $root/build.log"
|
|
cp "$root/target/release/makepad-builder-cli" "$root/makepad-builder.next"
|
|
chmod 700 "$root/makepad-builder.next"
|
|
mv -f "$root/makepad-builder.next" "$root/makepad-builder"
|
|
printf '%s' "$builder_stamp" > "$root/.builder-version"
|
|
fi
|
|
|
|
say "Ready. Start it again any time with $root/run-builder.sh"
|
|
exec "$root/makepad-builder" tui
|