Breeze moves to the released Kryon v0.6.0 (8d5d2e75) on Ziran 0.7.0 (55b01768), with plot 2b971b1b, css 9ee24b3f, game2d fcacb49c, entity fc8f3d89 and apps b95d1933 pinned to the same pair, so the lock keeps one Kryon and one toolchain. AppsControllerSha256 is the controller built from Apps b95d1933 on this graph. A toolchain bump broke the Android build twice with stale objects: - The Android CMake built its own copy of the toolchain in build/ziran-toolchain, shared across Ziran commits. It now uses the pinned checkout's build, which make already builds and which is per commit. - build-bundle-runtime.py reused its output folder across toolchains, and Ziran's make kept headers generated by the older Ziran because the new checkout's sources were older than them. The output now records the checkout it was built from and starts empty for another one. Local tests: native, desktop-window-test and habit-day-ui-test on a private Xvfb, the Ziran and native unit tests, the web build with its browser smoke test, windows-package, and the arm64 debug APK running on a Pixel 4a. apps-test passes except the packaged-locale checks, which fail only because of another lane's uncommitted src/locale_parser.zi. Co-Authored-By: Claude Opus 5.5 <[email protected]>
55 lines
1.9 KiB
Python
55 lines
1.9 KiB
Python
#!/usr/bin/env python3
|
|
"""Build the pinned Ziran host runtime for an app's target without source copies.
|
|
|
|
Node apps are ZX bundles, so the runtime carries Ziran's instruction engine; a
|
|
BOOTSTRAP=1 runtime opens no bundle. Ziran builds its own host compiler with
|
|
HOST_CC for these cross builds and makes the Wasm private-symbol headers.
|
|
Ziran's generated C comes from the pinned toolchain's own host zi2c
|
|
(GEN_ZI2C), not from a zi2c built for the target.
|
|
"""
|
|
|
|
import argparse
|
|
from pathlib import Path
|
|
import shutil
|
|
import subprocess
|
|
|
|
p = argparse.ArgumentParser()
|
|
p.add_argument("--source", type=Path, required=True)
|
|
p.add_argument("--output", type=Path, required=True)
|
|
p.add_argument("--cc", required=True)
|
|
p.add_argument("--ar", default="ar")
|
|
p.add_argument("--objcopy", default="objcopy")
|
|
p.add_argument("--flags", default="-O2 -fPIC")
|
|
p.add_argument("--wasm", action="store_true")
|
|
a = p.parse_args()
|
|
source = a.source.resolve()
|
|
output = a.output.resolve()
|
|
host_zi2c = source / "build/bin/zi2c"
|
|
if not host_zi2c.is_file():
|
|
raise SystemExit(f"{host_zi2c} is missing; build the pinned toolchain first")
|
|
# Ziran's make compares file times, and a newly pinned toolchain's sources can
|
|
# be older than the last runtime built here, so the output records the
|
|
# checkout it was built from and another checkout starts from an empty folder.
|
|
marker = output / ".toolchain-source"
|
|
if output.exists() and (not marker.is_file() or marker.read_text() != str(source)):
|
|
shutil.rmtree(output)
|
|
output.mkdir(parents=True, exist_ok=True)
|
|
command = [
|
|
"make",
|
|
"-j4",
|
|
"-C",
|
|
str(source),
|
|
"BUILD_DIR=" + str(output),
|
|
"CC=" + a.cc,
|
|
"AR=" + a.ar,
|
|
"OBJCOPY=" + a.objcopy,
|
|
"CFLAGS=" + a.flags,
|
|
"FRAMEFLAGS=-Wframe-larger-than=16384",
|
|
"GEN_ZI2C=" + str(host_zi2c),
|
|
]
|
|
if a.wasm:
|
|
command += ["TARGET_MACHINE=wasm32-unknown-emscripten"]
|
|
command += [str(output / "libziran.a")]
|
|
subprocess.run(command, check=True)
|
|
marker.write_text(str(source))
|