diff --git a/crates/release_channel/src/lib.rs b/crates/release_channel/src/lib.rs index 1052fc0c66..57597f4e82 100644 --- a/crates/release_channel/src/lib.rs +++ b/crates/release_channel/src/lib.rs @@ -44,10 +44,10 @@ pub static RELEASE_CHANNEL: LazyLock = #[cfg(target_os = "windows")] pub fn app_identifier() -> &'static str { match *RELEASE_CHANNEL { - ReleaseChannel::Dev => "Zed-Editor-Dev", - ReleaseChannel::Nightly => "Zed-Editor-Nightly", - ReleaseChannel::Preview => "Zed-Editor-Preview", - ReleaseChannel::Stable => "Zed-Editor-Stable", + ReleaseChannel::Dev => "Gwen-Editor-Dev", + ReleaseChannel::Nightly => "Gwen-Editor-Nightly", + ReleaseChannel::Preview => "Gwen-Editor-Preview", + ReleaseChannel::Stable => "Gwen-Editor-Stable", } } diff --git a/crates/zed/resources/windows/app-icon-gwen.ico b/crates/zed/resources/windows/app-icon-gwen.ico new file mode 100644 index 0000000000..10706f10d1 Binary files /dev/null and b/crates/zed/resources/windows/app-icon-gwen.ico differ diff --git a/crates/zed/resources/windows/zed.iss b/crates/zed/resources/windows/gwen.iss similarity index 99% rename from crates/zed/resources/windows/zed.iss rename to crates/zed/resources/windows/gwen.iss index b0481daa6a..9ec41aa714 100644 --- a/crates/zed/resources/windows/zed.iss +++ b/crates/zed/resources/windows/gwen.iss @@ -2,7 +2,7 @@ AppId={#AppId} AppName={#AppName} AppVerName={#AppDisplayName} -AppPublisher=Zed Industries +AppPublisher=yrkaierx AppPublisherURL=https://www.zed.dev/ AppSupportURL=https://www.zed.dev/ AppUpdatesURL=https://www.zed.dev/ @@ -65,7 +65,7 @@ Name: "addtopath"; Description: "{cm:AddToPath}"; GroupDescription: "{cm:Other}" Name: "{app}"; AfterInstall: DisableAppDirInheritance [Files] -Source: "{#ResourcesDir}\Zed.exe"; DestDir: "{code:GetInstallDir}"; Flags: ignoreversion +Source: "{#ResourcesDir}\Gwen.exe"; DestDir: "{code:GetInstallDir}"; Flags: ignoreversion Source: "{#ResourcesDir}\bin\*"; DestDir: "{code:GetInstallDir}\bin"; Flags: ignoreversion Source: "{#ResourcesDir}\tools\*"; DestDir: "{app}\tools"; Flags: ignoreversion Source: "{#ResourcesDir}\appx\*"; DestDir: "{app}\appx"; BeforeInstall: RemoveAppxPackage; AfterInstall: AddAppxPackage; Flags: ignoreversion; Check: IsWindows11OrLater @@ -1258,8 +1258,8 @@ Root: HKCU; Subkey: "Environment"; ValueType: expandsz; ValueName: "Path"; Value ; URI Scheme Root: HKCU; Subkey: "Software\Classes\zed"; ValueType: "string"; ValueData: "URL:zed Protocol"; Flags: uninsdeletekey Root: HKCU; Subkey: "Software\Classes\zed"; ValueType: "string"; ValueName: "URL Protocol"; ValueData: "" -Root: HKCU; Subkey: "Software\Classes\zed\DefaultIcon"; ValueType: "string"; ValueData: "{app}\Zed.exe,1" -Root: HKCU; Subkey: "Software\Classes\zed\shell\open\command"; ValueType: "string"; ValueData: """{app}\Zed.exe"" ""%1""" +Root: HKCU; Subkey: "Software\Classes\zed\DefaultIcon"; ValueType: "string"; ValueData: "{app}\Gwen.exe,1" +Root: HKCU; Subkey: "Software\Classes\zed\shell\open\command"; ValueType: "string"; ValueData: """{app}\Gwen.exe"" ""%1""" [Code] function WizardNotSilent(): Boolean; diff --git a/crates/zed/resources/windows/zed.sh b/crates/zed/resources/windows/gwen.sh similarity index 80% rename from crates/zed/resources/windows/zed.sh rename to crates/zed/resources/windows/gwen.sh index 734b1a7eb0..8eb5b7d784 100644 --- a/crates/zed/resources/windows/zed.sh +++ b/crates/zed/resources/windows/gwen.sh @@ -17,9 +17,9 @@ if [ $IN_WSL = true ]; then if [ -z "$WSL_USER" ]; then WSL_USER="$USERNAME" fi - "$ZED_PATH/zed.exe" --wsl "$WSL_USER@$WSL_DISTRO_NAME" "$@" + "$ZED_PATH/gwen.exe" --wsl "$WSL_USER@$WSL_DISTRO_NAME" "$@" exit $? else - "$ZED_PATH/zed.exe" "$@" + "$ZED_PATH/gwen.exe" "$@" exit $? fi diff --git a/script/bundle-windows.ps1 b/script/bundle-windows.ps1 index 786f07922b..14b30f2e05 100644 --- a/script/bundle-windows.ps1 +++ b/script/bundle-windows.ps1 @@ -117,7 +117,7 @@ function BuildZedAndItsFriends { Write-Output "Building Zed and its friends, for channel: $channel" # Build zed.exe, cli.exe and auto_update_helper.exe cargo --config .cargo/bundle-config.toml build --release --package zed --package cli --package auto_update_helper --target $target - Copy-Item -Path ".\$CargoOutDir\zed.exe" -Destination "$innoDir\Zed.exe" -Force + Copy-Item -Path ".\$CargoOutDir\gwen.exe" -Destination "$innoDir\Gwen.exe" -Force Copy-Item -Path ".\$CargoOutDir\cli.exe" -Destination "$innoDir\cli.exe" -Force Copy-Item -Path ".\$CargoOutDir\auto_update_helper.exe" -Destination "$innoDir\auto_update_helper.exe" -Force # Build explorer_command_injector.dll @@ -147,7 +147,7 @@ function BuildRemoteServer { & "$innoDir\sign.ps1" $remoteServerSrc } - $remoteServerDst = "$env:ZED_WORKSPACE\target\zed-remote-server-windows-$Architecture.zip" + $remoteServerDst = "$env:ZED_WORKSPACE\target\gwen-remote-server-windows-$Architecture.zip" Write-Output "Compressing remote_server to $remoteServerDst" Compress-Archive -Path $remoteServerSrc -DestinationPath $remoteServerDst -Force @@ -242,8 +242,8 @@ function DownloadConpty { function CollectFiles { Move-Item -Path "$innoDir\zed_explorer_command_injector.appx" -Destination "$innoDir\appx\zed_explorer_command_injector.appx" -Force Move-Item -Path "$innoDir\zed_explorer_command_injector.dll" -Destination "$innoDir\appx\zed_explorer_command_injector.dll" -Force - Move-Item -Path "$innoDir\cli.exe" -Destination "$innoDir\bin\zed.exe" -Force - Move-Item -Path "$innoDir\zed.sh" -Destination "$innoDir\bin\zed" -Force + Move-Item -Path "$innoDir\cli.exe" -Destination "$innoDir\bin\gwen.exe" -Force + Move-Item -Path "$innoDir\gwen.sh" -Destination "$innoDir\bin\gwen" -Force Move-Item -Path "$innoDir\auto_update_helper.exe" -Destination "$innoDir\tools\auto_update_helper.exe" -Force if($Architecture -eq "aarch64") { New-Item -Type Directory -Path "$innoDir\arm64" -Force @@ -261,7 +261,7 @@ function CollectFiles { } function BuildInstaller { - $issFilePath = "$innoDir\zed.iss" + $issFilePath = "$innoDir\gwen.iss" switch ($channel) { "stable" { $appId = "{{2DB0DA96-CA55-49BB-AF4F-64AF36A86712}" @@ -306,17 +306,17 @@ function BuildInstaller { $appAppxFullName = "ZedIndustries.Zed.Nightly_1.0.0.0_neutral__japxn1gcva8rg" } "dev" { - $appId = "{{8357632E-24A4-4F32-BA97-E575B4D1FE5D}" - $appIconName = "app-icon-dev" - $appName = "Zed Dev" - $appDisplayName = "Zed Dev" - $appSetupName = "Zed-$Architecture" + $appId = "{0497B7B8-186F-4CE7-A6E0-A20EADA832E1}" + $appIconName = "app-icon-gwen" + $appName = "Gwen" + $appDisplayName = "Gwen" + $appSetupName = "Gwen-$Architecture" # The mutex name here should match the mutex name in crates\zed\src\zed\windows_only_instance.rs - $appMutex = "Zed-Dev-Instance-Mutex" - $appExeName = "Zed" - $regValueName = "ZedDev" - $appUserId = "ZedIndustries.Zed.Dev" - $appShellNameShort = "Z&ed Dev" + $appMutex = "Gwen-Editor-Dev-Instance-Mutex" + $appExeName = "Gwen" + $regValueName = "GwenDev" + $appUserId = "yrkaierx.Gwen.Dev" + $appShellNameShort = "Gwen" $appAppxFullName = "ZedIndustries.Zed.Dev_1.0.0.0_neutral__japxn1gcva8rg" } default { @@ -328,7 +328,7 @@ function BuildInstaller { # Windows runner 2022 default has iscc in PATH, https://github.com/actions/runner-images/blob/main/images/windows/Windows2022-Readme.md # Currently, we are using Windows 2022 runner. # Windows runner 2025 doesn't have iscc in PATH for now, https://github.com/actions/runner-images/issues/11228 - $innoSetupPath = "C:\Program Files (x86)\Inno Setup 6\ISCC.exe" + $innoSetupPath = "F:\Cache\inno6\ISCC.exe" $definitions = @{ "AppId" = $appId