diff --git a/Cargo.lock b/Cargo.lock index 2e9c4fddd7..72f41661f7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -18598,6 +18598,7 @@ dependencies = [ "workspace", "workspace-hack", "zed_actions", + "zedless", "zedless_settings", "zeta", "zlog", @@ -18707,7 +18708,7 @@ dependencies = [ [[package]] name = "zedless" -version = "0.1.0" +version = "1.0.0" dependencies = [ "anyhow", "workspace-hack", diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml index 81cb791ab6..4b5a21a1d5 100644 --- a/crates/zed/Cargo.toml +++ b/crates/zed/Cargo.toml @@ -152,6 +152,7 @@ workspace.workspace = true zed_actions.workspace = true zeta.workspace = true title_bar.workspace = true +zedless.workspace = true zedless_settings.workspace = true zlog.workspace = true zlog_settings.workspace = true diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs index fa5651eafe..515e3a167e 100644 --- a/crates/zed/src/zed.rs +++ b/crates/zed/src/zed.rs @@ -947,24 +947,29 @@ fn about( ) { let release_channel = ReleaseChannel::global(cx).display_name(); let version = env!("CARGO_PKG_VERSION"); + let zedless_version = zedless::ZEDLESS_VERSION; let debug = if cfg!(debug_assertions) { "(debug)" } else { "" }; - let message = format!("{release_channel} {version} {debug}"); - let detail = AppCommitSha::try_global(cx).map(|sha| sha.full()); + let message = format!("{release_channel} {zedless_version} {debug}"); + let detail = if let Some(commit_hash) = AppCommitSha::try_global(cx).map(|sha| sha.full()) { + format!("{commit_hash}\n\nBased on Zed {version}") + } else { + format!("Based on Zed {version}") + }; let prompt = window.prompt( PromptLevel::Info, &message, - detail.as_deref(), + Some(&detail), &["Copy", "OK"], cx, ); cx.spawn(async move |_, cx| { if let Ok(0) = prompt.await { - let content = format!("{}\n{}", message, detail.as_deref().unwrap_or("")); + let content = format!("{}\n{}", message, detail); cx.update(|cx| { cx.write_to_clipboard(gpui::ClipboardItem::new_string(content)); }) diff --git a/crates/zedless/Cargo.toml b/crates/zedless/Cargo.toml index 73c331c5a1..eabfef033e 100644 --- a/crates/zedless/Cargo.toml +++ b/crates/zedless/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zedless" -version = "0.1.0" +version = "1.0.0" edition.workspace = true publish.workspace = true license = "GPL-3.0-or-later" diff --git a/crates/zedless/src/zedless.rs b/crates/zedless/src/zedless.rs index 2a4cd90fe7..9cb82098f8 100644 --- a/crates/zedless/src/zedless.rs +++ b/crates/zedless/src/zedless.rs @@ -11,3 +11,5 @@ impl From for SilentError { SilentError::Error { error: err } } } + +pub const ZEDLESS_VERSION: &'static str = env!("CARGO_PKG_VERSION"); \ No newline at end of file diff --git a/nix/package.nix b/nix/package.nix index fee441f78c..813818725e 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -45,8 +45,8 @@ let gpu-lib = if withGLES then libglvnd else vulkan-loader; # Cargo.toml located in repo root does not contain any version information. - cargoToml = fromTOML (readFile ../crates/zed/Cargo.toml); - pname = "zedless"; + cargoToml = fromTOML (readFile ../crates/zedless/Cargo.toml); + pname = cargoToml.package.name; version = cargoToml.package.version; src = toSource { root = ../.;