Skip to content

Run a virtual iPhone on an Apple Silicon Mac.

Swift

Stamp the build commit into VPhone.bundle's Info.plist

Jacky61b0d3422695
diff --git a/VPhoneExecutable/VPhoneVirtualization/Build/StageBundle.sh b/VPhoneExecutable/VPhoneVirtualization/Build/StageBundle.sh
index 164cb8dd..c6818c0b 100755
--- a/VPhoneExecutable/VPhoneVirtualization/Build/StageBundle.sh
+++ b/VPhoneExecutable/VPhoneVirtualization/Build/StageBundle.sh
@@ -77,6 +77,20 @@ fi
/bin/cp "$guest_products/gpu/libAppleParavirtCompilerPluginIOGPUFamily.dylib" \
"$guest/libAppleParavirtCompilerPluginIOGPUFamily.dylib"
+# The commit this bundle was built from, shown in vphone-vm's app menu next to
+# CFBundleShortVersionString and CFBundleVersion. A tree with uncommitted
+# tracked changes is marked dirty. Outside a git checkout the key is removed,
+# so an incremental build never keeps a stale hash.
+info_plist="$bundle/Contents/Info.plist"
+if build_hash="$(/usr/bin/git -C "$root" rev-parse --verify --short HEAD 2>/dev/null)"; then
+ if [[ -n "$(/usr/bin/git -C "$root" status --porcelain --untracked-files=no 2>/dev/null)" ]]; then
+ build_hash+="-dirty"
+ fi
+ /usr/bin/plutil -replace VPhoneBuildHash -string "$build_hash" "$info_plist"
+else
+ /usr/bin/plutil -remove VPhoneBuildHash "$info_plist" 2>/dev/null || true
+fi
+
# Patch presets. Prewritten plists, read by vphone-cli at patch time to decide
# which declared patches apply. Nothing generates or edits these.
/bin/mkdir -p "$resources/patches_presets"
diff --git a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuController.swift b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuController.swift
index a4e70c5d..111ed128 100644
--- a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuController.swift
+++ b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuController.swift
@@ -83,10 +83,8 @@ class VPhoneMenuController {
// App menu
let appMenuItem = NSMenuItem()
let appMenu = NSMenu(title: "vphone")
- let buildHash = Bundle.main.object(forInfoDictionaryKey: "VPhoneBuildHash") as? String
- let buildTitle = buildHash.flatMap { $0.isEmpty ? nil : $0 } ?? VPhoneLocalization.text("unknown")
let buildItem = NSMenuItem(
- title: VPhoneLocalization.format("Build: %@", buildTitle),
+ title: VPhoneLocalization.format("Build: %@", Self.buildDescription()),
action: nil,
keyEquivalent: "",
)
@@ -154,6 +152,23 @@ class VPhoneMenuController {
NSApp.mainMenu = mainMenu
}
+ /// "2.3.2 (26, 735927f)": the bundle version, its build number and the
+ /// commit `StageBundle.sh` stamped into the Info.plist. vphone-vm runs from
+ /// `VPhone.bundle/Contents/MacOS`, so `Bundle.main` is that bundle.
+ static func buildDescription() -> String {
+ func value(_ key: String) -> String? {
+ (Bundle.main.object(forInfoDictionaryKey: key) as? String).flatMap { $0.isEmpty ? nil : $0 }
+ }
+ let details = [value("CFBundleVersion"), value("VPhoneBuildHash")].compactMap(\.self)
+ let detail = details.isEmpty ? nil : details.joined(separator: ", ")
+ switch (value("CFBundleShortVersionString"), detail) {
+ case let (version?, detail?): return "\(version) (\(detail))"
+ case let (version?, nil): return version
+ case let (nil, detail?): return detail
+ case (nil, nil): return VPhoneLocalization.text("unknown")
+ }
+ }
+
func makeItem(
_ title: String,
action: Selector,