Skip to content

增加mac签名，删除附加安装说明 #2

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

Open
idealclover wants to merge 2 commits into
base: main
Choose a base branch
from
Open

增加mac签名，删除附加安装说明 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5abdb5
:computer: 增加mac公证
idealclover Apr 21, 2026
dc61708
Merge branch 'main' into main
idealclover Apr 27, 2026
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
87 changes: 59 additions & 28 deletions scripts/build_universal_dmg.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,52 +7,83 @@ cd "$ROOT_DIR"
PRODUCT="Topdo"
VERSION="1.0.1"
APP_NAME="$PRODUCT.app"
NOTICE_FILE="$ROOT_DIR/docs/01_安装说明.txt"

SIGNING_IDENTITY="Developer ID Application: Ronghao cui (6Z4232N2L9)"

check_notarization_env() {
if [ -n "${APPLE_ID:-}" ] && [ -n "${APPLE_PASSWORD:-}" ] && [ -n "${APPLE_TEAM_ID:-}" ]; then
return 0
else
return 1
fi
}

echo "========================================="
echo " $PRODUCT v$VERSION 构建脚本"
echo "========================================="
echo ""

if check_notarization_env; then
echo "[信息] 检测到公证环境变量，构建后将自动公证"
else
echo "[警告] 未检测到公证环境变量 (APPLE_ID, APPLE_PASSWORD, APPLE_TEAM_ID)"
echo " 应用将仅签名，不进行公证。分发给其他用户时可能会被 Gatekeeper 拦截。"
echo " 设置方法: export APPLE_ID=xxx APPLE_PASSWORD=xxx APPLE_TEAM_ID=6Z4232N2L9"
fi
echo ""

echo "[1/3] 确保 Rust 双目标已安装..."
rustup target add x86_64-apple-darwin >/dev/null

echo "[2/3] 构建 Universal app..."
pnpm tauri build --target universal-apple-darwin --bundles app
echo "[2/3] 构建 Universal app + dmg（含签名）..."
pnpm tauri build --target universal-apple-darwin --bundles app,dmg

BUNDLE_BASE="$ROOT_DIR/src-tauri/target/universal-apple-darwin/release/bundle"
DMG_DIR="$BUNDLE_BASE/dmg"
MACOS_DIR="$BUNDLE_BASE/macos"
BUNDLE_DMG_SH="$DMG_DIR/bundle_dmg.sh"
VOL_ICON="$DMG_DIR/icon.icns"
APP_PATH="$MACOS_DIR/$APP_NAME"
OUTPUT_DMG="$DMG_DIR/${PRODUCT}_${VERSION}_universal.dmg"
TEMP_DMG="$DMG_DIR/${PRODUCT}_${VERSION}_universal_with_notice.dmg"
SRC_FOLDER="$MACOS_DIR"

if [ ! -d "$APP_PATH" ]; then
echo "[错误] 未找到 app: $APP_PATH"
exit 1
fi
if [ ! -f "$BUNDLE_DMG_SH" ]; then
echo "[错误] 未找到 bundle_dmg.sh: $BUNDLE_DMG_SH"
if [ ! -f "$OUTPUT_DMG" ]; then
echo "[错误] 未找到 dmg: $OUTPUT_DMG"
exit 1
fi
if [ ! -f "$NOTICE_FILE" ]; then
echo "[错误] 未找到安装说明: $NOTICE_FILE"
exit 1

echo "签名 DMG..."
codesign --sign "$SIGNING_IDENTITY" --force "$OUTPUT_DMG"

echo ""
echo "[3/3] 验证签名..."
codesign --verify --deep --strict --verbose=2 "$APP_PATH" 2>&1 || true
codesign --verify --verbose=2 "$OUTPUT_DMG" 2>&1 || true
echo ""

if check_notarization_env; then
echo "提交 DMG 公证..."
NOTARY_SUBMIT_OUTPUT=$(xcrun notarytool submit "$OUTPUT_DMG" \
--apple-id "$APPLE_ID" \
--password "$APPLE_PASSWORD" \
--team-id "$APPLE_TEAM_ID" \
--wait 2>&1) || true
echo "$NOTARY_SUBMIT_OUTPUT"

if echo "$NOTARY_SUBMIT_OUTPUT" | grep -q "status: Accepted"; then
echo "公证成功，装订票据到 DMG..."
xcrun stapler staple "$OUTPUT_DMG"
echo ""
echo "[完成] 已签名并公证的发布包已生成"
else
echo "[警告] 公证未通过，请检查输出日志"
echo " 可运行 xcrun notarytool log <submission-id> --apple-id \$APPLE_ID --password \$APPLE_PASSWORD --team-id \$APPLE_TEAM_ID 查看详情"
fi
else
echo "[完成] 已签名的发布包已生成（未公证）"
fi

echo "[3/3] 重新打包 DMG（注入安装说明）..."
rm -f "$TEMP_DMG"
rm -f "$OUTPUT_DMG"
"$BUNDLE_DMG_SH" \
--volname "$PRODUCT" \
--icon "$APP_NAME" 180 220 \
--app-drop-link 480 220 \
--window-size 660 400 \
--hide-extension "$APP_NAME" \
--add-file "01_安装说明.txt" "$NOTICE_FILE" 330 320 \
--volicon "$VOL_ICON" \
"$TEMP_DMG" \
"$SRC_FOLDER"
mv -f "$TEMP_DMG" "$OUTPUT_DMG"

echo "[完成] 发布包已生成"
echo ""
echo "Universal app: $APP_PATH"
echo "Universal dmg: $OUTPUT_DMG"
14 changes: 14 additions & 0 deletions src-tauri/Topdo.entitlements
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.cs.allow-jit</key>
<true/>
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
<true/>
<key>com.apple.security.cs.disable-library-validation</key>
<true/>
<key>com.apple.security.network.client</key>
<true/>
</dict>
</plist>
3 changes: 2 additions & 1 deletion src-tauri/tauri.conf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
"targets": ["app", "dmg"],
"category": "Productivity",
"macOS": {
"signingIdentity": "-",
"signingIdentity": "Developer ID Application: Ronghao cui (6Z4232N2L9)",
"entitlements": "./Topdo.entitlements",
"minimumSystemVersion": "10.15",
"dmg": {
"windowSize": {
Expand Down