Skip to content

emrg: build-release 十七次修复 — Windows bin/python 缺 DLL + emrg/emrgd 探测（rant #13）#385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
argszero merged 1 commit into from
Aug 4, 2026
Merged

emrg: build-release 十七次修复 — Windows bin/python 缺 DLL + emrg/emrgd 探测（rant #13） #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion bin/emrg
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,4 +22,12 @@ PREFIX="$(dirname "$DIR")"
export PATH="$DIR:$PATH"
export PYTHONPATH="$PREFIX/source:$PREFIX/lib:$PYTHONPATH"
export PYTHONDONTWRITEBYTECODE=1
exec "$DIR/python" -m emrg "$@"
# R100: Windows 下 bin/python（复制品）缺 DLL 不可用（DLL 在 python-dist/ 根）→
# 探测 python-dist 里的 exe（与 emrg.cmd 一致）；POSIX 用 bin/python 软链。
PY_BIN="$DIR/python"
if [ -e "$DIR/python-dist/python.exe" ]; then
PY_BIN="$DIR/python-dist/python.exe"
elif [ -e "$DIR/python-dist/python3.13.exe" ]; then
PY_BIN="$DIR/python-dist/python3.13.exe"
fi
exec "$PY_BIN" -m emrg "$@"
10 changes: 9 additions & 1 deletion bin/emrgd
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,4 +16,12 @@ PREFIX="$(dirname "$DIR")"
export PATH="$DIR:$PATH"
export PYTHONPATH="$PREFIX/source:$PREFIX/lib:$PYTHONPATH"
export PYTHONDONTWRITEBYTECODE=1
exec "$DIR/python" -m emrg.server "$@"
# R100: Windows 下 bin/python（复制品）缺 DLL 不可用（DLL 在 python-dist/ 根）→
# 探测 python-dist 里的 exe（与 emrgd.cmd 一致）；POSIX 用 bin/python 软链。
PY_BIN="$DIR/python"
if [ -e "$DIR/python-dist/python.exe" ]; then
PY_BIN="$DIR/python-dist/python.exe"
elif [ -e "$DIR/python-dist/python3.13.exe" ]; then
PY_BIN="$DIR/python-dist/python3.13.exe"
fi
exec "$PY_BIN" -m emrg.server "$@"
5 changes: 5 additions & 0 deletions packaging/build-runtime.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,11 @@ cp -R "$PY_ROOT/." "$DIST/bin/python-dist/"
# Windows：Git Bash 的 ln -s 需管理员权限（软链创建失败）→ 用复制替代
cp "$PYEXE" python.exe
cp "$PYEXE" python3.exe
# R100：python-build-standalone 的 DLL（python313.dll/vcruntime140*.dll 等）
# 在 python-dist/ 根目录——bin/python.exe 复制品缺 DLL 不可用（Windows loader
# 找不到 → 启动失败）。把根目录 *.dll 一并复制到 bin/，使 PATH 里的
# python 命令（session-scoped 脚本）可用。
cp python-dist/*.dll . 2>/dev/null || true
else
ln -sfn python-dist/bin/python3.13 python
ln -sfn python-dist/bin/python3.13 python3
Expand Down
Loading