Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7bc93c2014 | ||
|
|
374af50acc | ||
|
|
1a5771ec27 | ||
|
|
234a4226c5 |
@@ -5,6 +5,9 @@
|
|||||||
# App bundle (build artifact, regenerate with ./build-app.sh)
|
# App bundle (build artifact, regenerate with ./build-app.sh)
|
||||||
Kapture.app/
|
Kapture.app/
|
||||||
|
|
||||||
|
# Secrets
|
||||||
|
*.p8
|
||||||
|
|
||||||
# macOS
|
# macOS
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
|
||||||
|
|||||||
@@ -86,8 +86,10 @@ final class ScreenCapture {
|
|||||||
|
|
||||||
@available(macOS 14.0, *)
|
@available(macOS 14.0, *)
|
||||||
private func crop(_ image: CGImage, to rect: NSRect, display: SCDisplay) -> CGImage? {
|
private func crop(_ image: CGImage, to rect: NSRect, display: SCDisplay) -> CGImage? {
|
||||||
let scaleX = CGFloat(display.width) / display.frame.width
|
// Scale from the actual captured image dimensions, which reflect the
|
||||||
let scaleY = CGFloat(display.height) / display.frame.height
|
// stream's pixel output (retina => 2x, non-retina => 1x).
|
||||||
|
let scaleX = CGFloat(image.width) / display.frame.width
|
||||||
|
let scaleY = CGFloat(image.height) / display.frame.height
|
||||||
let cgRect = CGRect(
|
let cgRect = CGRect(
|
||||||
x: rect.minX,
|
x: rect.minX,
|
||||||
y: rect.minY,
|
y: rect.minY,
|
||||||
@@ -133,8 +135,13 @@ final class ScreenCapture {
|
|||||||
let excluded = content.windows.filter { excludedSet.contains($0.windowID) }
|
let excluded = content.windows.filter { excludedSet.contains($0.windowID) }
|
||||||
let filter = SCContentFilter(display: display, excludingWindows: excluded)
|
let filter = SCContentFilter(display: display, excludingWindows: excluded)
|
||||||
let config = SCStreamConfiguration()
|
let config = SCStreamConfiguration()
|
||||||
config.width = Int(display.width)
|
// width/height are in points. Use the display's backing scale so
|
||||||
config.height = Int(display.height)
|
// retina captures come out at full pixel resolution.
|
||||||
|
let backingScale = NSScreen.screens.first(where: { $0.frame.contains(
|
||||||
|
NSPoint(x: rect.midX, y: rect.midY)
|
||||||
|
) })?.backingScaleFactor ?? 2
|
||||||
|
config.width = Int(display.frame.width * backingScale)
|
||||||
|
config.height = Int(display.frame.height * backingScale)
|
||||||
config.showsCursor = true
|
config.showsCursor = true
|
||||||
|
|
||||||
guard let image = try? await SCScreenshotManager.captureImage(contentFilter: filter, configuration: config) else {
|
guard let image = try? await SCScreenshotManager.captureImage(contentFilter: filter, configuration: config) else {
|
||||||
|
|||||||
@@ -193,9 +193,14 @@ struct ResultView: View {
|
|||||||
.padding(.top, 10)
|
.padding(.top, 10)
|
||||||
|
|
||||||
if model.mode == .screenshot {
|
if model.mode == .screenshot {
|
||||||
|
GeometryReader { geo in
|
||||||
|
let imageWidth = CGFloat(model.image.width)
|
||||||
Image(nsImage: NSImage(cgImage: model.image, size: .zero))
|
Image(nsImage: NSImage(cgImage: model.image, size: .zero))
|
||||||
.resizable()
|
.resizable()
|
||||||
|
// Downscale with smoothing (AA); upscale keeps pixels crisp.
|
||||||
|
.interpolation(imageWidth >= geo.size.width ? .high : .none)
|
||||||
.aspectRatio(contentMode: .fit)
|
.aspectRatio(contentMode: .fit)
|
||||||
|
}
|
||||||
.border(Color.secondary.opacity(0.4))
|
.border(Color.secondary.opacity(0.4))
|
||||||
.padding(.horizontal, 12)
|
.padding(.horizontal, 12)
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
+7
-5
@@ -23,8 +23,10 @@ SIGN_KEYCHAIN=""
|
|||||||
if [ -n "$DEV_IDENT" ]; then
|
if [ -n "$DEV_IDENT" ]; then
|
||||||
CERT="$DEV_IDENT"
|
CERT="$DEV_IDENT"
|
||||||
echo "Using Developer ID identity: $CERT"
|
echo "Using Developer ID identity: $CERT"
|
||||||
# Sign from the login keychain where the Dev ID lives.
|
# Ensure the login keychain holding the Dev ID is unlocked & accessible.
|
||||||
SIGN_KEYCHAIN=""
|
security unlock-keychain "$HOME/Library/Keychains/login.keychain-db" 2>/dev/null || true
|
||||||
|
security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "" "$HOME/Library/Keychains/login.keychain-db" >/dev/null 2>&1 || true
|
||||||
|
SIGN_KEYCHAIN="$HOME/Library/Keychains/login.keychain-db"
|
||||||
else
|
else
|
||||||
CERT="kapture-dev"
|
CERT="kapture-dev"
|
||||||
echo "Using self-signed identity 'kapture-dev'"
|
echo "Using self-signed identity 'kapture-dev'"
|
||||||
@@ -106,9 +108,9 @@ cat > "$APP/Contents/Info.plist" <<'PLIST'
|
|||||||
<key>CFBundleIconFile</key>
|
<key>CFBundleIconFile</key>
|
||||||
<string>Icon</string>
|
<string>Icon</string>
|
||||||
<key>CFBundleShortVersionString</key>
|
<key>CFBundleShortVersionString</key>
|
||||||
<string>1.1.0</string>
|
<string>1.1.3</string>
|
||||||
<key>CFBundleVersion</key>
|
<key>CFBundleVersion</key>
|
||||||
<string>10</string>
|
<string>13</string>
|
||||||
<key>LSUIElement</key>
|
<key>LSUIElement</key>
|
||||||
<true/>
|
<true/>
|
||||||
<key>NSHighResolutionCapable</key>
|
<key>NSHighResolutionCapable</key>
|
||||||
@@ -123,7 +125,7 @@ chmod +x scripts/make-icon.sh
|
|||||||
./scripts/make-icon.sh
|
./scripts/make-icon.sh
|
||||||
|
|
||||||
if [ -n "$SIGN_KEYCHAIN" ]; then
|
if [ -n "$SIGN_KEYCHAIN" ]; then
|
||||||
codesign --force --sign "$CERT" --keychain "$SIGN_KEYCHAIN" "$APP"
|
codesign --force --options runtime --sign "$CERT" --keychain "$SIGN_KEYCHAIN" "$APP"
|
||||||
else
|
else
|
||||||
codesign --force --sign "$CERT" "$APP"
|
codesign --force --sign "$CERT" "$APP"
|
||||||
fi
|
fi
|
||||||
|
|||||||
+71
-2
@@ -8,14 +8,83 @@ if [ "$#" -ne 1 ]; then
|
|||||||
fi
|
fi
|
||||||
VERSION="$1"
|
VERSION="$1"
|
||||||
|
|
||||||
|
# Notarization credentials. Configure once, e.g. in ~/.zshrc:
|
||||||
|
# export KAPTURE_NOTARY_ASC_PROVIDER="<TeamID>"
|
||||||
|
# export KAPTURE_NOTARY_API_KEY_PATH="$HOME/.config/kapture/AuthKey_XXXX.p8"
|
||||||
|
# export KAPTURE_NOTARY_API_KEY_ID="<KeyID>"
|
||||||
|
# export KAPTURE_NOTARY_API_ISSUER="<IssuerID>"
|
||||||
|
# If these are unset (or KAPTURE_SKIP_NOTARY=1), release.sh builds, zips, and stops
|
||||||
|
# there — the zip is signed with the Developer ID identity but NOT notarized.
|
||||||
|
|
||||||
./build-app.sh
|
./build-app.sh
|
||||||
|
|
||||||
mkdir -p dist
|
mkdir -p dist
|
||||||
rm -f dist/Kapture.zip
|
rm -f dist/Kapture.zip
|
||||||
ditto -c -k --keepParent Kapture.app dist/Kapture.zip
|
ditto -c -k --keepParent Kapture.app dist/Kapture.zip
|
||||||
shasum -a 256 dist/Kapture.zip
|
|
||||||
|
|
||||||
|
if [ -n "${KAPTURE_SKIP_NOTARY:-}" ]; then
|
||||||
|
echo
|
||||||
|
echo "Skipping notarization (KAPTURE_SKIP_NOTARY set)."
|
||||||
|
shasum -a 256 dist/Kapture.zip
|
||||||
|
echo
|
||||||
|
echo "Tag and release with:"
|
||||||
|
echo " git tag v$VERSION && git push origin v$VERSION"
|
||||||
|
echo "Attach dist/Kapture.zip to the GitHub release manually."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
REQUIRED_VARS="KAPTURE_NOTARY_ASC_PROVIDER KAPTURE_NOTARY_API_KEY_PATH KAPTURE_NOTARY_API_KEY_ID KAPTURE_NOTARY_API_ISSUER"
|
||||||
|
MISSING=""
|
||||||
|
for v in $REQUIRED_VARS; do
|
||||||
|
if [ -z "${!v:-}" ]; then
|
||||||
|
MISSING="$MISSING $v"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if [ -n "$MISSING" ]; then
|
||||||
|
echo "Notarization skipped — missing env var(s):$MISSING (see header comments)." >&2
|
||||||
|
shasum -a 256 dist/Kapture.zip
|
||||||
|
echo
|
||||||
|
echo "The zip above is signed but NOT notarized; Gatekeeper will warn users until it is."
|
||||||
|
echo "Set the KAPTURE_NOTARY_* variables and re-run ./release.sh $VERSION."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! command -v xcrun >/dev/null 2>&1 || ! xcrun --find notarytool >/dev/null 2>&1; then
|
||||||
|
echo "Notarization skipped — xcrun notarytool not found (requires Xcode 13+)." >&2
|
||||||
|
shasum -a 256 dist/Kapture.zip
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Submitting to Apple for notarization (first run can take minutes)..."
|
||||||
|
xcrun notarytool submit dist/Kapture.zip \
|
||||||
|
--key "$KAPTURE_NOTARY_API_KEY_PATH" \
|
||||||
|
--key-id "$KAPTURE_NOTARY_API_KEY_ID" \
|
||||||
|
--issuer "$KAPTURE_NOTARY_API_ISSUER" \
|
||||||
|
--wait \
|
||||||
|
--output-format json > notary-result.json
|
||||||
|
|
||||||
|
STATUS=$(jq -r '.status' notary-result.json 2>/dev/null || echo "unknown")
|
||||||
|
if [ "$STATUS" != "Accepted" ]; then
|
||||||
|
echo "Notarization failed with status: $STATUS" >&2
|
||||||
|
if [ -f notary-result.json ]; then
|
||||||
|
cat notary-result.json >&2
|
||||||
|
rm -f notary-result.json
|
||||||
|
fi
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
rm -f notary-result.json
|
||||||
|
|
||||||
|
echo "Notarization accepted — stapling ticket onto the app..."
|
||||||
|
xcrun stapler staple Kapture.app
|
||||||
|
xcrun stapler validate Kapture.app
|
||||||
|
|
||||||
|
rm -f dist/Kapture.zip
|
||||||
|
ditto -c -k --keepParent Kapture.app dist/Kapture.zip
|
||||||
|
|
||||||
|
echo
|
||||||
|
echo "Done — notarized."
|
||||||
|
shasum -a 256 dist/Kapture.zip
|
||||||
echo
|
echo
|
||||||
echo "Tag and release with:"
|
echo "Tag and release with:"
|
||||||
echo " git tag v$VERSION && git push origin v$VERSION"
|
echo " git tag v$VERSION && git push origin v$VERSION"
|
||||||
echo "Attach dist/Kapture.zip to the GitHub release manually."
|
echo "Attach dist/Kapture.zip to the GitHub release manually; the Homebrew cask is ready."
|
||||||
|
|||||||
Reference in New Issue
Block a user