fix(package): package.sh 跟进 desktop/ 改名,并在 keg-only 安装下自动找到 cargo
上一个提交把 windows/ 改成 desktop/ 时漏掉了 package.sh —— 当时的 grep 只覆盖 .md/.py/.ps1/.toml/.yml,没有扫 .sh,导致打包脚本仍然 cd windows 并寻找 qft-windows 二进制。 - 路径与二进制名跟进 desktop/ 与 qft-desktop - cargo 检测增加兜底:brew 的 rustup 是 keg-only, /opt/homebrew/opt/rustup/bin 不会自动进 PATH,此前会出现 "明明装了工具链却报 cargo 未找到"。现在先在常见位置探一次, 仍找不到时给出可直接执行的修复命令而不是一句干巴巴的报错 - .gitignore 忽略 /dist 打包产物(release 二进制 14 MB,不应入库) 已在 macOS 上完整跑通 ./package.sh:cargo test 17/17 通过、 release 构建成功、产出 QFT-Rust-0.5.0-m1-<时间戳>-darwin 目录与 tar.gz,内含 14 MB 的 Mach-O arm64 可执行文件与 SHA256SUMS.txt。
This commit is contained in:
@@ -19,3 +19,5 @@ ios/**/xcuserdata/
|
||||
ios/**/*.xcworkspace/xcuserdata/
|
||||
ios/build/
|
||||
DerivedData/
|
||||
# package.sh 打包产物
|
||||
/dist
|
||||
|
||||
+23
-7
@@ -5,16 +5,32 @@ QFT_ROOT=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
|
||||
cd "$QFT_ROOT"
|
||||
|
||||
echo "== QFT Rust one-click package =="
|
||||
command -v cargo >/dev/null 2>&1 || { echo "ERROR: Rust cargo was not found in PATH." >&2; exit 1; }
|
||||
if ! command -v cargo >/dev/null 2>&1; then
|
||||
# rustup 装在 keg-only 目录里时不会自动进 PATH,这里兜一下,
|
||||
# 避免用户明明装了工具链却被告知"没装"。
|
||||
for QFT_CANDIDATE in "/opt/homebrew/opt/rustup/bin" "$HOME/.cargo/bin"; do
|
||||
if [ -x "$QFT_CANDIDATE/cargo" ]; then
|
||||
PATH="$QFT_CANDIDATE:$PATH"
|
||||
export PATH
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
command -v cargo >/dev/null 2>&1 || {
|
||||
echo "ERROR: Rust cargo was not found in PATH." >&2
|
||||
echo " brew 安装:brew install rustup && rustup default stable" >&2
|
||||
echo " 并把 /opt/homebrew/opt/rustup/bin 加入 PATH" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
echo "[1/3] Testing and building the Rust desktop release..."
|
||||
(
|
||||
cd windows
|
||||
cd desktop
|
||||
cargo test
|
||||
cargo build --release
|
||||
)
|
||||
|
||||
QFT_VERSION=$(awk -F'"' '/^\[package\]/{package=1; next} package && /^version[[:space:]]*=/{print $2; exit} /^\[/{package=0}' windows/Cargo.toml)
|
||||
QFT_VERSION=$(awk -F'"' '/^\[package\]/{package=1; next} package && /^version[[:space:]]*=/{print $2; exit} /^\[/{package=0}' desktop/Cargo.toml)
|
||||
[ -n "$QFT_VERSION" ] || QFT_VERSION=unknown
|
||||
QFT_STAMP=$(date '+%Y%m%d-%H%M%S')
|
||||
QFT_PLATFORM=$(uname -s | tr '[:upper:]' '[:lower:]')
|
||||
@@ -23,10 +39,10 @@ QFT_PACKAGE_DIR="$QFT_ROOT/dist/$QFT_PACKAGE"
|
||||
|
||||
echo "[2/3] Collecting Rust artifacts..."
|
||||
mkdir -p "$QFT_PACKAGE_DIR"
|
||||
if [ -f "windows/target/release/qft-windows.exe" ]; then
|
||||
cp "windows/target/release/qft-windows.exe" "$QFT_PACKAGE_DIR/QFT-Windows.exe"
|
||||
elif [ -f "windows/target/release/qft-windows" ]; then
|
||||
cp "windows/target/release/qft-windows" "$QFT_PACKAGE_DIR/QFT-Desktop"
|
||||
if [ -f "desktop/target/release/qft-desktop.exe" ]; then
|
||||
cp "desktop/target/release/qft-desktop.exe" "$QFT_PACKAGE_DIR/QFT-Windows.exe"
|
||||
elif [ -f "desktop/target/release/qft-desktop" ]; then
|
||||
cp "desktop/target/release/qft-desktop" "$QFT_PACKAGE_DIR/QFT-Desktop"
|
||||
else
|
||||
echo "ERROR: desktop release binary was not produced." >&2
|
||||
exit 1
|
||||
|
||||
Reference in New Issue
Block a user