hanzoai/dev
2
0
Fork 0
mirror of https://github.com/hanzoai/dev.git synced 2026-10-25 03:32:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge(upstream): upstream/main into upstream-merge (by-bucket)

Browse Source 
- Preserve our TUI, CLI, workflows per policy
- Adopted upstream engine initially, reverted due to build breakages
- Kept our core/protocol/exec/file-search to maintain compatibility
- Purged upstream codex-cli images per purge policy
- Fix: build-fast.sh supports both exec bin names (code-exec/codex-exec)

Verification: scripts/upstream-merge/verify.sh passed; ./build-fast.sh ok
This commit is contained in:
just-every-code
2025-09-09 20:56:28 +00:00
parent fbb1763616 84e9ac776a
commit 7aabd663ad
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-fast.sh
+14 -2
View File
@@ -254,9 +254,17 @@ fi
# Build for native target (no --target flag) for maximum speed
# This reuses the host stdlib and normal cache
# Determine exec binary name based on workspace (support forks)
EXEC_BIN="codex-exec"
# Detect legacy bin name used in some forks
if grep -q '^name\s*=\s*"code-exec"' ./exec/Cargo.toml 2>/dev/null; then
EXEC_BIN="code-exec"
fi
# Build with or without --locked based on lockfile validity
# Keep stderr and stdout separate so downstream tools can capture both streams.
${USE_CARGO} build ${USE_LOCKED} --profile "${PROFILE}" --bin code --bin code-tui --bin code-exec
echo "Using exec bin: ${EXEC_BIN}"
${USE_CARGO} build ${USE_LOCKED} --profile "${PROFILE}" --bin code --bin code-tui --bin "${EXEC_BIN}"
# Check if build succeeded
if [ $? -eq 0 ]; then
@@ -295,7 +303,11 @@ if [ $? -eq 0 ]; then
echo "Deterministic post-link: removing LC_UUID from executables"
${USE_CARGO} rustc ${USE_LOCKED} --profile "${PROFILE}" -p codex-cli --bin code -- -C link-arg=-Wl,-no_uuid || true
${USE_CARGO} rustc ${USE_LOCKED} --profile "${PROFILE}" -p codex-tui --bin code-tui -- -C link-arg=-Wl,-no_uuid || true
${USE_CARGO} rustc ${USE_LOCKED} --profile "${PROFILE}" -p codex-exec --bin code-exec -- -C link-arg=-Wl,-no_uuid || true
if [ "$EXEC_BIN" = "codex-exec" ]; then
${USE_CARGO} rustc ${USE_LOCKED} --profile "${PROFILE}" -p codex-exec --bin codex-exec -- -C link-arg=-Wl,-no_uuid || true
else
${USE_CARGO} rustc ${USE_LOCKED} --profile "${PROFILE}" -p codex-exec --bin code-exec -- -C link-arg=-Wl,-no_uuid || true
fi
fi
# Compute absolute path and SHA256 for clarity (after any post-linking)