diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6bf947b7..1d16087b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,7 +50,7 @@ jobs: - name: Crate msi installer run: | ./WiX.*/tools/candle.exe -nologo -arch "x64" -ext WixUIExtension -ext WixUtilExtension \ - -out "./alacritty.wixobj" "extra/windows/wix/alacritty.wxs" + -out "./alacritty.wixobj" "alacritty/windows/wix/alacritty.wxs" ./WiX.*/tools/light.exe -nologo -ext WixUIExtension -ext WixUtilExtension \ -out "./Alacritty-${GITHUB_REF##*/}-installer.msi" -sice:ICE61 -sice:ICE91 \ "./alacritty.wixobj" diff --git a/alacritty/alacritty.png b/alacritty/alacritty.png deleted file mode 120000 index 3865403a..00000000 --- a/alacritty/alacritty.png +++ /dev/null @@ -1 +0,0 @@ -../extra/logo/compat/alacritty-term.png \ No newline at end of file diff --git a/alacritty/extra b/alacritty/extra new file mode 120000 index 00000000..858d6fa4 --- /dev/null +++ b/alacritty/extra @@ -0,0 +1 @@ +../extra \ No newline at end of file diff --git a/alacritty/src/display/window.rs b/alacritty/src/display/window.rs index 2710edb0..3cc00a98 100644 --- a/alacritty/src/display/window.rs +++ b/alacritty/src/display/window.rs @@ -59,7 +59,7 @@ use crate::gl; /// Window icon for `_NET_WM_ICON` property. #[cfg(all(feature = "x11", not(any(target_os = "macos", windows))))] -static WINDOW_ICON: &[u8] = include_bytes!("../../alacritty.png"); +static WINDOW_ICON: &[u8] = include_bytes!("../../extra/logo/compat/alacritty-term.png"); /// This should match the definition of IDI_ICON from `alacritty.rc`. #[cfg(windows)] diff --git a/extra/alacritty.yml b/extra/alacritty.yml new file mode 120000 index 00000000..2db9ba40 --- /dev/null +++ b/extra/alacritty.yml @@ -0,0 +1 @@ +../alacritty.yml \ No newline at end of file diff --git a/extra/windows b/extra/windows deleted file mode 120000 index 1c83ac5e..00000000 --- a/extra/windows +++ /dev/null @@ -1 +0,0 @@ -../alacritty/windows \ No newline at end of file