Include extra directory in crate

Instead of having the extra symlink in the root, this puts the symlink
in the alacritty crate. Since we build the package on Linux this is not
a problem and even allows us to get rid of the `alacritty.png` symlink.

To avoid having complicated symlinks with regards to the windows build
assets directory, it has just been removed from the `extra` directory
completely. Since we only need it for building, it doesn't matter where
it's located and users will never have to interact with it manually
anyway.

Closes #6242.

.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"

alacritty/alacritty.png

@@ -1 +0,0 @@
-../extra/logo/compat/alacritty-term.png

alacritty/extra

@@ -0,0 +1 @@
+../extra

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)]

extra/alacritty.yml

@@ -0,0 +1 @@
+../alacritty.yml

extra/windows

@@ -1 +0,0 @@
-../alacritty/windows