diff options
author | Christian Duerr <contact@christianduerr.com> | 2020-08-01 01:11:24 +0000 |
---|---|---|
committer | Christian Duerr <contact@christianduerr.com> | 2020-08-01 03:10:59 +0200 |
commit | 55a185d00f51f9003e0e4681acb1ef1ae9ab35f4 (patch) | |
tree | a6f8a7a0d08921f6c18f870b281a948346fc411e | |
parent | a46bb5a6e89018ab7d648c5434a4036808922b27 (diff) | |
download | alacritty-55a185d00f51f9003e0e4681acb1ef1ae9ab35f4.tar.gz alacritty-55a185d00f51f9003e0e4681acb1ef1ae9ab35f4.zip |
Fix crates.io publishing restrictions
This works around the problem that crates pushed to crates.io cannot
reference files outside of their crate directory.
-rw-r--r-- | alacritty/Cargo.toml | 2 | ||||
l--------- | alacritty/README.md | 1 | ||||
l--------- | alacritty/alacritty.ico | 1 | ||||
-rw-r--r-- | alacritty/res/rect.f.glsl (renamed from res/rect.f.glsl) | 0 | ||||
-rw-r--r-- | alacritty/res/rect.v.glsl (renamed from res/rect.v.glsl) | 0 | ||||
-rw-r--r-- | alacritty/res/text.f.glsl (renamed from res/text.f.glsl) | 0 | ||||
-rw-r--r-- | alacritty/res/text.v.glsl (renamed from res/text.v.glsl) | 0 | ||||
-rw-r--r-- | alacritty/src/renderer/mod.rs | 20 | ||||
-rw-r--r-- | alacritty/src/window.rs | 2 |
9 files changed, 12 insertions, 14 deletions
diff --git a/alacritty/Cargo.toml b/alacritty/Cargo.toml index 5aedc61a..23c49216 100644 --- a/alacritty/Cargo.toml +++ b/alacritty/Cargo.toml @@ -4,7 +4,7 @@ version = "0.5.0" authors = ["Christian Duerr <contact@christianduerr.com>", "Joe Wilm <joe@jwilm.com>"] license = "Apache-2.0" description = "GPU-accelerated terminal emulator" -readme = "../README.md" +readme = "README.md" homepage = "https://github.com/alacritty/alacritty" edition = "2018" diff --git a/alacritty/README.md b/alacritty/README.md new file mode 120000 index 00000000..32d46ee8 --- /dev/null +++ b/alacritty/README.md @@ -0,0 +1 @@ +../README.md
\ No newline at end of file diff --git a/alacritty/alacritty.ico b/alacritty/alacritty.ico new file mode 120000 index 00000000..55cd1859 --- /dev/null +++ b/alacritty/alacritty.ico @@ -0,0 +1 @@ +../extra/windows/alacritty.ico
\ No newline at end of file diff --git a/res/rect.f.glsl b/alacritty/res/rect.f.glsl index 12e40469..12e40469 100644 --- a/res/rect.f.glsl +++ b/alacritty/res/rect.f.glsl diff --git a/res/rect.v.glsl b/alacritty/res/rect.v.glsl index 8baa74ff..8baa74ff 100644 --- a/res/rect.v.glsl +++ b/alacritty/res/rect.v.glsl diff --git a/res/text.f.glsl b/alacritty/res/text.f.glsl index cf477eb0..cf477eb0 100644 --- a/res/text.f.glsl +++ b/alacritty/res/text.f.glsl diff --git a/res/text.v.glsl b/alacritty/res/text.v.glsl index 8978c111..8978c111 100644 --- a/res/text.v.glsl +++ b/alacritty/res/text.v.glsl diff --git a/alacritty/src/renderer/mod.rs b/alacritty/src/renderer/mod.rs index 58d43406..79df6b34 100644 --- a/alacritty/src/renderer/mod.rs +++ b/alacritty/src/renderer/mod.rs @@ -35,20 +35,16 @@ use crate::renderer::rects::RenderRect; pub mod rects; // Shader paths for live reload. -static TEXT_SHADER_F_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/../res/text.f.glsl"); -static TEXT_SHADER_V_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/../res/text.v.glsl"); -static RECT_SHADER_F_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/../res/rect.f.glsl"); -static RECT_SHADER_V_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/../res/rect.v.glsl"); +static TEXT_SHADER_F_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/res/text.f.glsl"); +static TEXT_SHADER_V_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/res/text.v.glsl"); +static RECT_SHADER_F_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/res/rect.f.glsl"); +static RECT_SHADER_V_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/res/rect.v.glsl"); // Shader source which is used when live-shader-reload feature is disable. -static TEXT_SHADER_F: &str = - include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/../res/text.f.glsl")); -static TEXT_SHADER_V: &str = - include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/../res/text.v.glsl")); -static RECT_SHADER_F: &str = - include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/../res/rect.f.glsl")); -static RECT_SHADER_V: &str = - include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/../res/rect.v.glsl")); +static TEXT_SHADER_F: &str = include_str!("../../res/text.f.glsl"); +static TEXT_SHADER_V: &str = include_str!("../../res/text.v.glsl"); +static RECT_SHADER_F: &str = include_str!("../../res/rect.f.glsl"); +static RECT_SHADER_V: &str = include_str!("../../res/rect.v.glsl"); /// `LoadGlyph` allows for copying a rasterized glyph into graphics memory. pub trait LoadGlyph { diff --git a/alacritty/src/window.rs b/alacritty/src/window.rs index 81a61218..dd1c2265 100644 --- a/alacritty/src/window.rs +++ b/alacritty/src/window.rs @@ -42,7 +42,7 @@ use crate::gl; // It's required to be in this directory due to the `windows.rc` file. #[cfg(not(any(target_os = "macos", windows)))] -static WINDOW_ICON: &[u8] = include_bytes!("../../extra/windows/alacritty.ico"); +static WINDOW_ICON: &[u8] = include_bytes!("../alacritty.ico"); // This should match the definition of IDI_ICON from `windows.rc`. #[cfg(windows)] |