wip build for macos

Author: brandonskiser

Cargo.lock

@@ -82,10 +82,19 @@ def build_chat_bin(
         return out_path
 
 
-def build_macos(chat_path: pathlib.Path):
+def sign_and_notarize(chat_path: pathlib.Path):
+    # First, sign the application
+
+    # Next, notarize the application
+
+    # Last, staple the notarization to the application
     pass
 
 
+def build_macos(chat_path: pathlib.Path):
+    sign_and_notarize(chat_path)
+
+
 def build_linux(chat_path: pathlib.Path):
     """
     Creates tar.gz, tar.xz, tar.zst, and zip archives under `BUILD_DIR`.

build-scripts/qchatbuild.py

@@ -170,6 +170,7 @@ nix = { version = "0.29.0", features = [
 skim = { version = "0.16.2" }
 
 [target.'cfg(target_os = "macos")'.dependencies]
+embed_plist = "1.2"
 objc2 = "0.5.2"
 objc2-app-kit = { version = "0.2.2", features = ["NSWorkspace"] }
 objc2-foundation = { version = "0.2.2", features = ["NSString", "NSURL"] }

crates/chat-cli/Cargo.toml

@@ -39,9 +39,47 @@ struct Def {
     metrics: Vec<MetricDef>,
 }
 
+/// Writes a generated Info.plist for the qchat executable under src/.
+///
+/// This is required for signing the executable since we must embed the Info.plist directly within
+/// the binary.
+#[cfg(target_os = "macos")]
+fn write_plist() {
+    let plist = format!(
+        r#"
+<?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>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleIdentifier</key>
+    <string>com.amazon.codewhisperer</string>
+    <key>CFBundleName</key>
+    <string>{}</string>
+    <key>CFBundleVersion</key>
+    <string>{}</string>
+    <key>CFBundleShortVersionString</key>
+    <string>{}/string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>NSHumanReadableCopyright</key>
+    <string>Copyright © 2022 Amazon Q CLI Team ([email protected]):Chay Nabors ([email protected]):Brandon Kiser ([email protected]) All rights reserved.</string>
+</dict>
+"#,
+        option_env!("AMAZON_Q_BUILD_HASH").unwrap_or("unknown"),
+        option_env!("AMAZON_Q_BUILD_DATETIME").unwrap_or("unknown"),
+        env!("CARGO_PKG_VERSION")
+    );
+
+    std::fs::write("src/Info.plist", plist).expect("writing the Info.plist should not fail");
+}
+
 fn main() {
     println!("cargo:rerun-if-changed=def.json");
 
+    write_plist();
+
     let outdir = std::env::var("OUT_DIR").unwrap();
 
     let data = serde_json::from_str::<Def>(DEF).unwrap();

crates/chat-cli/build.rs

@@ -23,6 +23,9 @@ use tracing::metadata::LevelFilter;
 static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
 
 fn main() -> Result<ExitCode> {
+    #[cfg(target_os = "macos")]
+    embed_plist::embed_info_plist!("Info.plist");
+
     color_eyre::install()?;
 
     let parsed = match cli::Cli::try_parse() {