diff options
author | har7an <99636919+har7an@users.noreply.github.com> | 2022-12-09 10:49:32 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-09 10:49:32 +0000 |
commit | 1e141aa7fe4a49a8df8b0c268952d01268776199 (patch) | |
tree | 56e7db7f6713f78eec7a7f3b2afea06f585bea66 /zellij-utils | |
parent | 36233439f930f0c50bed574e95ff4cd887893120 (diff) |
HOTFIX: utils: Move plugins into new assets folder (#2003)
that is included in the utils to make builds pass.
Diffstat (limited to 'zellij-utils')
-rw-r--r-- | zellij-utils/Cargo.toml | 1 | ||||
-rw-r--r-- | zellij-utils/src/consts.rs | 14 | ||||
-rw-r--r-- | zellij-utils/src/input/plugins.rs | 6 | ||||
-rw-r--r-- | zellij-utils/src/setup.rs | 6 |
4 files changed, 10 insertions, 17 deletions
diff --git a/zellij-utils/Cargo.toml b/zellij-utils/Cargo.toml index 6d0e34519..0e88c63a6 100644 --- a/zellij-utils/Cargo.toml +++ b/zellij-utils/Cargo.toml @@ -5,6 +5,7 @@ authors = ["Kunal Mohan <kunalmohan99@gmail.com>"] edition = "2021" description = "A utility library for Zellij client and server" license = "MIT" +include = ["src/**/*", "assets/"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/zellij-utils/src/consts.rs b/zellij-utils/src/consts.rs index 328be223b..0e8a6acc1 100644 --- a/zellij-utils/src/consts.rs +++ b/zellij-utils/src/consts.rs @@ -35,10 +35,10 @@ pub const FEATURES: &[&str] = &[ "disable_automatic_asset_installation", ]; -#[cfg(all(not(target_family = "wasm"), feature = "asset_map"))] +#[cfg(not(target_family = "wasm"))] pub use not_wasm::*; -#[cfg(all(not(target_family = "wasm"), feature = "asset_map"))] +#[cfg(not(target_family = "wasm"))] mod not_wasm { use lazy_static::lazy_static; use std::collections::HashMap; @@ -49,17 +49,9 @@ mod not_wasm { ($assets:expr, $plugin:literal) => { $assets.insert( PathBuf::from("plugins").join($plugin), - #[cfg(debug_assertions)] include_bytes!(concat!( env!("CARGO_MANIFEST_DIR"), - "/../target/wasm32-wasi/debug/", - $plugin - )) - .to_vec(), - #[cfg(not(debug_assertions))] - include_bytes!(concat!( - env!("CARGO_MANIFEST_DIR"), - "/../assets/plugins/", + "/assets/plugins/", $plugin )) .to_vec(), diff --git a/zellij-utils/src/input/plugins.rs b/zellij-utils/src/input/plugins.rs index 7503f43b0..1ab3e831f 100644 --- a/zellij-utils/src/input/plugins.rs +++ b/zellij-utils/src/input/plugins.rs @@ -9,7 +9,7 @@ use serde::{Deserialize, Serialize}; use url::Url; use super::layout::{RunPlugin, RunPluginLocation}; -#[cfg(all(not(target_family = "wasm"), feature = "asset_map"))] +#[cfg(not(target_family = "wasm"))] use crate::consts::ASSET_MAP; pub use crate::data::PluginTag; use crate::errors::prelude::*; @@ -129,7 +129,7 @@ impl PluginConfig { for path in paths { // Check if the plugin path matches an entry in the asset map. If so, load it directly // from memory, don't bother with the disk. - #[cfg(all(not(target_family = "wasm"), feature = "asset_map"))] + #[cfg(not(target_family = "wasm"))] if !cfg!(feature = "disable_automatic_asset_installation") && self.is_builtin() { let asset_path = PathBuf::from("plugins").join(path); if let Some(bytes) = ASSET_MAP.get(&asset_path) { @@ -160,7 +160,7 @@ impl PluginConfig { } // Not reached if a plugin is found! - #[cfg(all(not(target_family = "wasm"), feature = "asset_map"))] + #[cfg(not(target_family = "wasm"))] if self.is_builtin() { // Layout requested a builtin plugin that wasn't found let plugin_path = self.path.with_extension("wasm"); diff --git a/zellij-utils/src/setup.rs b/zellij-utils/src/setup.rs index 5de536c71..ddbc59673 100644 --- a/zellij-utils/src/setup.rs +++ b/zellij-utils/src/setup.rs @@ -1,4 +1,4 @@ -#[cfg(all(not(target_family = "wasm"), feature = "asset_map"))] +#[cfg(not(target_family = "wasm"))] use crate::consts::ASSET_MAP; use crate::input::theme::Themes; use crate::{ @@ -175,7 +175,7 @@ pub fn dump_specified_layout(layout: &str) -> std::io::Result<()> { } } -#[cfg(all(not(target_family = "wasm"), feature = "asset_map"))] +#[cfg(not(target_family = "wasm"))] pub fn dump_builtin_plugins(path: &PathBuf) -> Result<()> { for (asset_path, bytes) in ASSET_MAP.iter() { let plugin_path = path.join(asset_path); @@ -205,7 +205,7 @@ pub fn dump_builtin_plugins(path: &PathBuf) -> Result<()> { Ok(()) } -#[cfg(any(target_family = "wasm", not(feature = "asset_map")))] +#[cfg(target_family = "wasm")] pub fn dump_builtin_plugins(_path: &PathBuf) -> Result<()> { Ok(()) } |