mirror of
https://github.com/hanzoai/dev.git
synced 2026-10-25 03:32:32 +00:00
zeekayandHanzo Dev
6cbbea2d03
Our history is just-every's with author emails rewritten, so the graphs are
disjoint and git finds no merge base. Supplied one by hand: d1f1f51a41, the
just-every commit matching our Oct-2025 fork point (22 files apart). 9618
upstream commits, 7004 files, +1.81M/-159k, 37 conflicts.
Resolution:
- Upstream code where our side was the Oct-2025 prototype of a feature they
have since reimplemented 3-5x larger (agent_runs, browser_sessions,
history_cell/{agent,browser}, the vt100 harness and its snapshots).
- Upstream's config.rs module split (builder/defaults/sources/validation)
kept; zen5-coder and the provider-follows-model rule re-applied on top.
- Ours where the file IS the identity: README, package.json, postinstall,
release notes pipeline, integration-zed.
- Hybrid where upstream improved a file we had branded: updates.rs (their
release-repo migration, our hanzoai/dev), release.yml (their fail-fast npm
auth check, our package name), chatwidget.rs (their turn handling, our
HANZO_USER_KEY hint), exec human output (their 237 lines, our banner).
Superseded and dropped deliberately: our resume_command_name() coder-alias
hack — upstream's derive_resume_command_name() reads the invocation basename
generically, which yields "dev" for us.
LLM.md now records the real topology and the sync point; AGENTS.md and
CLAUDE.md are symlinks to it again. Single parent on purpose: adopting
jecode/main as a second parent would re-import 13,742 commits carrying the
upstream author emails a prior rewrite deliberately removed.
Version 0.2.188 -> 0.2.189.
Co-authored-by: Hanzo Dev <[email protected]>
76 lines
2.9 KiB
Diff
76 lines
2.9 KiB
Diff
diff --git a/build.rs b/build.rs
|
|
index 3b4a24a..6aa06ff 100644
|
|
--- a/build.rs
|
|
+++ b/build.rs
|
|
@@ -15,1 +15,2 @@
|
|
-use std::path::Path;
|
|
+use std::fs;
|
|
+use std::path::Path;
|
|
@@ -118,1 +119,9 @@
|
|
- println!("cargo:rustc-link-search=native={}", webrtc_lib.to_str().unwrap());
|
|
+ let webrtc_link_lib = if env::var_os("WEBRTC_SYS_LINK_OUT_DIR").is_some() {
|
|
+ let out_lib = PathBuf::from(env::var_os("OUT_DIR").unwrap()).join("lib");
|
|
+ fs::create_dir_all(&out_lib).unwrap();
|
|
+ fs::copy(webrtc_lib.join("libwebrtc.a"), out_lib.join("libwebrtc.a")).unwrap();
|
|
+ out_lib
|
|
+ } else {
|
|
+ webrtc_lib
|
|
+ };
|
|
+ println!("cargo:rustc-link-search=native={}", webrtc_link_lib.to_str().unwrap());
|
|
@@ -255,1 +264,1 @@
|
|
- println!("cargo:rustc-link-lib=framework=Appkit");
|
|
+ println!("cargo:rustc-link-lib=framework=AppKit");
|
|
@@ -320,1 +329,18 @@
|
|
- builder.warnings(false).compile("webrtcsys-cxx");
|
|
+ builder.warnings(false).compile("webrtcsys-cxx");
|
|
+ let cxxbridge_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap()).join("cxxbridge");
|
|
+ let cxx_header = cxxbridge_dir.join("include/rust/cxx.h");
|
|
+ if fs::symlink_metadata(&cxx_header)
|
|
+ .is_ok_and(|metadata| metadata.file_type().is_symlink())
|
|
+ {
|
|
+ if let Ok(header) = fs::read(&cxx_header) {
|
|
+ fs::remove_file(&cxx_header).unwrap();
|
|
+ fs::write(&cxx_header, header).unwrap();
|
|
+ }
|
|
+ }
|
|
+ let crate_link = cxxbridge_dir.join("crate/webrtc-sys");
|
|
+ if fs::symlink_metadata(&crate_link)
|
|
+ .is_ok_and(|metadata| metadata.file_type().is_symlink())
|
|
+ {
|
|
+ fs::remove_file(crate_link).unwrap();
|
|
+ }
|
|
+
|
|
@@ -375,1 +384,3 @@
|
|
- println!("cargo:rustc-link-lib={}", clang_rt);
|
|
+ if env::var_os("WEBRTC_SYS_LINK_OUT_DIR").is_none() {
|
|
+ println!("cargo:rustc-link-lib={}", clang_rt);
|
|
+ }
|
|
@@ -378,6 +389,21 @@
|
|
- let sysroot = Command::new("xcrun").args(["--sdk", sdk, "--show-sdk-path"]).output().unwrap();
|
|
-
|
|
- let sysroot = String::from_utf8_lossy(&sysroot.stdout);
|
|
- let sysroot = sysroot.trim();
|
|
-
|
|
- let search_dirs = Command::new("cc").arg("--print-search-dirs").output().unwrap();
|
|
+ let sysroot = env::var("WEBRTC_SYS_DARWIN_SDK_PATH").unwrap_or_else(|_| {
|
|
+ let output = Command::new("xcrun")
|
|
+ .args(["--sdk", sdk, "--show-sdk-path"])
|
|
+ .output()
|
|
+ .unwrap();
|
|
+ String::from_utf8_lossy(&output.stdout).into_owned()
|
|
+ });
|
|
+
|
|
+ let sysroot = sysroot.as_str();
|
|
+ let sysroot = sysroot.trim();
|
|
+ builder.flag(format!("-F{sysroot}/System/Library/Frameworks"));
|
|
+ builder.define("__APPLICATIONSERVICES__", None);
|
|
+ builder.flag("-include");
|
|
+ builder.flag("CoreGraphics/CoreGraphics.h");
|
|
+ builder.include(format!("{sysroot}/usr/include"));
|
|
+
|
|
+ let cc = env::var("CC").unwrap_or_else(|_| "cc".to_string());
|
|
+ let search_dirs = Command::new(cc)
|
|
+ .arg("--print-search-dirs")
|
|
+ .output()
|
|
+ .unwrap();
|