diff --git a/.gitignore b/.gitignore index 2eece7f..d2c9d75 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,5 @@ ios/**/xcuserdata/ ios/**/*.xcworkspace/xcuserdata/ ios/build/ DerivedData/ +# package.sh 打包产物 +/dist diff --git a/package.sh b/package.sh index 0ba3f19..7966b14 100755 --- a/package.sh +++ b/package.sh @@ -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