array2d · miaobyte · Aug 17, 2026 · Aug 17, 2026
diff --git a/.gitignore b/.gitignore
@@ -57,3 +57,5 @@ appendonly.aof
 *.kvfail
 *.kv.skip
 tutorial/test_failures.csv
+
+/bin/
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/Makefile b/Makefile
@@ -1,17 +1,42 @@
-.PHONY: build test vet clean kvspace install
+# kvlang 统一构建：产物全部输出到 bin/，各组件独立编译。
+#   make runtime   C runtime 库（libkvlang_runtime.so，经 CMake）
+#   make term      Rust term 扩展（term 可执行文件，独立进程）
+#   make run       测试执行器（run，链接 runtime）
+#   make layout    Rust layout（layout_file）
+#   make json      Go json 扩展（json-rwirext 可执行文件）
+#   make oldhero   Go 旧 runtime（kvlang，兼容保留）
+#   make all       全部
+#   make clean     清理 bin/ 与各构建目录
 
-export GOPROXY ?= https://goproxy.cn,direct
-PREFIX   ?= ~/.local
+BIN         := bin
+KVSPACE_LIB ?= kvspace-c
 
-build:
-	go mod tidy
-	go build -ldflags="-s -w" -o kvlang ./cmd/kvlang/
-	install -d $(PREFIX)/bin
-	install kvlang $(PREFIX)/bin/kvlang
+.PHONY: all runtime term run layout json oldhero clean
 
-vet:
-	go vet ./...
+all: runtime term run layout json
+
+runtime:
+	cmake -S runtime -B build/runtime -DCMAKE_BUILD_TYPE=Release -DKVSPACE_LIB=$(KVSPACE_LIB)
+	cmake --build build/runtime --target kvlang_runtime -j
+
+term:
+	cargo build --release --manifest-path runtime-rwirext/rust/term/Cargo.toml
+	cp runtime-rwirext/rust/term/target/release/term $(BIN)/
+
+run: runtime
+	cmake --build build/runtime --target run -j
+
+layout:
+	KVLANG_KVSPACE_LIB=$(KVSPACE_LIB) cargo build --release --manifest-path layout/Cargo.toml --example layout_file
+	cp layout/target/release/examples/layout_file $(BIN)/
+
+json:
+	cd runtime-rwirext/go/json && go build -o ../../../bin/json-rwirext ./cmd/
+
+oldhero:
+	cd oldhero && go build -ldflags="-s -w" -o ../bin/kvlang ./cmd/kvlang/
 
 clean:
-	go clean
-	rm -f kvlang
+	rm -rf $(BIN) build
+	cargo clean --manifest-path layout/Cargo.toml
+	cargo clean --manifest-path runtime-rwirext/rust/term/Cargo.toml
diff --git a/cmd/kvlang/main.cppx b/cmd/kvlang/main.cppx
diff --git a/deepx-design b/deepx-design
diff --git a/keytree/const.h b/keytree/const.h
diff --git a/keytree/dev.h b/keytree/dev.h
diff --git a/keytree/entry.h b/keytree/entry.h
diff --git a/keytree/frame.h b/keytree/frame.h
diff --git a/keytree/keytree_stub.cppx b/keytree/keytree_stub.cppx
diff --git a/keytree/member.h b/keytree/member.h
diff --git a/keytree/sys.h b/keytree/sys.h
diff --git a/keytree/vthread.h b/keytree/vthread.h
diff --git a/kvcpu/cpu.h b/kvcpu/cpu.h
+1 −1		doc/kvlang-design-and-implementation/runtime篇-05-rwirext扩展运行时.md
+11 −3		doc/kvlang-design-and-implementation/runtime篇-06-C运行时与后端抽象.md