Run a virtual iPhone on an Apple Silicon Mac.
Swift
refactor: read optional build hash from app Info.plist
Lakra6ebbc3c65f8
diff --git a/.gitignore b/.gitignoreindex c7f0737c..a5bc447e 100644--- a/.gitignore+++ b/.gitignore@@ -335,7 +335,6 @@ __marimo__//references/Scripts/VPhoned/vphoned/cfw_input/-Sources/VPhoneCore/VPhoneBuildInfo.swift# libarchive drops zero-byte tar.XXXXXXXX files in the process's working# directory while restoring macOS metadata — a relative mkstemp template in# its own sources, so TMPDIR does not redirect them. Harmless, but they shoulddiff --git a/Scripts/build.sh b/Scripts/build.shindex 40c1ceca..a1fbf590 100755--- a/Scripts/build.sh+++ b/Scripts/build.sh@@ -41,8 +41,7 @@ BUNDLE_ASKPASS="${BUNDLE}/Contents/MacOS/vphone-ask-for-permission"BUNDLE_AMFI="${BUNDLE}/Contents/MacOS/vphone-amfi-allow"INFO_PLIST="Sources/Info.plist"ENTITLEMENTS="Sources/vphone.entitlements"-BUILD_INFO="Sources/VPhoneCore/VPhoneBuildInfo.swift"-GIT_HASH="$(git rev-parse --short HEAD 2>/dev/null || echo unknown)"+GIT_HASH="$(git rev-parse --verify --short HEAD 2>/dev/null || echo unknown)"for arg in "$@"; docase "$arg" in@@ -53,8 +52,6 @@ done# --- Build + sign the binary ---echo "=== Building vphone-cli (${GIT_HASH}) ==="-echo '// Auto-generated — do not edit' > "$BUILD_INFO"-echo "enum VPhoneBuildInfo { static let commitHash = \"${GIT_HASH}\" }" >> "$BUILD_INFO"swift build -c release --jobs "${SWIFT_JOBS:-4}"# vphone-amfi-allow, which SwiftPM cannot produce: it reads amfid's ObjC runtime@@ -109,6 +106,9 @@ cp -f "$ARCHIVE_BINARY" "$BUNDLE_ARCHIVE"cp -f "$ASKPASS_BINARY" "$BUNDLE_ASKPASS"cp -f "$AMFI_BINARY" "$BUNDLE_AMFI"cp -f "$INFO_PLIST" "${BUNDLE}/Contents/Info.plist"+if [[ "$GIT_HASH" != unknown ]]; then+ /usr/libexec/PlistBuddy -c "Add :VPhoneBuildHash string ${GIT_HASH}" "${BUNDLE}/Contents/Info.plist"+ficp -f "Sources/AppIcon.icns" "${BUNDLE}/Contents/Resources/AppIcon.icns"rm -f "${BUNDLE}/Contents/Resources/signcert.p12"# The bundle is built over whatever is already there, so these two are removeddiff --git a/Sources/VPhoneVirtualMachineKit/UserInterface/Menu/VPhoneMenuController.swift b/Sources/VPhoneVirtualMachineKit/UserInterface/Menu/VPhoneMenuController.swiftindex 6eae0c36..785b2ace 100644--- a/Sources/VPhoneVirtualMachineKit/UserInterface/Menu/VPhoneMenuController.swift+++ b/Sources/VPhoneVirtualMachineKit/UserInterface/Menu/VPhoneMenuController.swift@@ -65,15 +65,9 @@ class VPhoneMenuController {// App menulet appMenuItem = NSMenuItem()let appMenu = NSMenu(title: "vphone")- #if canImport(VPhoneBuildInfo)- let buildItem = NSMenuItem(- title: "Build: \(VPhoneBuildInfo.commitHash)",- action: nil,- keyEquivalent: "",- )- #else- let buildItem = NSMenuItem(title: "Build: unknown", action: nil, keyEquivalent: "")- #endif+ let buildHash = Bundle.main.object(forInfoDictionaryKey: "VPhoneBuildHash") as? String+ let buildTitle = buildHash.flatMap { $0.isEmpty ? nil : $0 } ?? "unknown"+ let buildItem = NSMenuItem(title: "Build: \(buildTitle)", action: nil, keyEquivalent: "")buildItem.isEnabled = falseappMenu.addItem(buildItem)appMenu.addItem(NSMenuItem.separator())