Move src to meli/src
|
@ -1221,7 +1221,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "meli"
|
name = "meli"
|
||||||
version = "0.7.2"
|
version = "0.7.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-task",
|
"async-task",
|
||||||
"bitflags",
|
"bitflags",
|
||||||
|
@ -1258,7 +1258,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "melib"
|
name = "melib"
|
||||||
version = "0.7.2"
|
version = "0.8.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-stream",
|
"async-stream",
|
||||||
"base64 0.13.1",
|
"base64 0.13.1",
|
||||||
|
@ -1804,9 +1804,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rustix"
|
name = "rustix"
|
||||||
version = "0.37.22"
|
version = "0.37.23"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8818fa822adcc98b18fedbb3632a6a33213c070556b5aa7c4c8cc21cff565c4c"
|
checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags",
|
"bitflags",
|
||||||
"errno",
|
"errno",
|
||||||
|
@ -1981,9 +1981,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "smallvec"
|
name = "smallvec"
|
||||||
version = "1.10.0"
|
version = "1.11.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
|
checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde",
|
"serde",
|
||||||
]
|
]
|
||||||
|
@ -2217,18 +2217,6 @@ dependencies = [
|
||||||
"serde",
|
"serde",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "tools"
|
|
||||||
version = "0.4.1"
|
|
||||||
dependencies = [
|
|
||||||
"crossbeam",
|
|
||||||
"meli",
|
|
||||||
"melib",
|
|
||||||
"nix",
|
|
||||||
"signal-hook",
|
|
||||||
"signal-hook-registry",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tracing"
|
name = "tracing"
|
||||||
version = "0.1.37"
|
version = "0.1.37"
|
||||||
|
|
94
Cargo.toml
|
@ -1,74 +1,9 @@
|
||||||
[package]
|
[workspace]
|
||||||
name = "meli"
|
|
||||||
version = "0.7.2"
|
|
||||||
authors = ["Manos Pitsidianakis <el13635@mail.ntua.gr>"]
|
|
||||||
edition = "2018"
|
|
||||||
rust-version = "1.65.0"
|
|
||||||
|
|
||||||
license = "GPL-3.0-or-later"
|
members = [
|
||||||
readme = "README.md"
|
"meli",
|
||||||
description = "terminal mail client"
|
"melib",
|
||||||
homepage = "https://meli.delivery"
|
]
|
||||||
repository = "https://git.meli.delivery/meli/meli.git"
|
|
||||||
keywords = ["mail", "mua", "maildir", "terminal", "imap"]
|
|
||||||
categories = ["command-line-utilities", "email"]
|
|
||||||
default-run = "meli"
|
|
||||||
|
|
||||||
[[bin]]
|
|
||||||
name = "meli"
|
|
||||||
path = "src/main.rs"
|
|
||||||
|
|
||||||
[lib]
|
|
||||||
name = "meli"
|
|
||||||
path = "src/lib.rs"
|
|
||||||
|
|
||||||
[[bin]]
|
|
||||||
name = "managesieve-client"
|
|
||||||
path = "src/managesieve.rs"
|
|
||||||
required-features = ["melib/imap_backend"]
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
async-task = "^4.2.0"
|
|
||||||
bitflags = "1.0"
|
|
||||||
crossbeam = { version = "^0.8" }
|
|
||||||
flate2 = { version = "1", optional = true }
|
|
||||||
futures = "0.3.5"
|
|
||||||
indexmap = { version = "^1.6", features = ["serde-1", ] }
|
|
||||||
libc = { version = "0.2.125", default-features = false, features = ["extra_traits",] }
|
|
||||||
linkify = { version = "^0.8", default-features = false }
|
|
||||||
melib = { path = "melib", version = "0.7.2" }
|
|
||||||
nix = { version = "^0.24", default-features = false }
|
|
||||||
notify = { version = "4.0.1", default-features = false } # >:c
|
|
||||||
num_cpus = "1.12.0"
|
|
||||||
pcre2 = { version = "0.2.3", optional = true }
|
|
||||||
|
|
||||||
serde = "1.0.71"
|
|
||||||
serde_derive = "1.0.71"
|
|
||||||
serde_json = "1.0"
|
|
||||||
signal-hook = { version = "^0.3", default-features = false }
|
|
||||||
signal-hook-registry = { version = "1.2.0", default-features = false }
|
|
||||||
smallvec = { version = "^1.5.0", features = ["serde", ] }
|
|
||||||
structopt = { version = "0.3.14", default-features = false }
|
|
||||||
svg_crate = { version = "^0.13", optional = true, package = "svg" }
|
|
||||||
termion = { version = "1.5.1", default-features = false }
|
|
||||||
toml = { version = "0.5.6", default-features = false, features = ["preserve_order", ] }
|
|
||||||
unicode-segmentation = "1.2.1" # >:c
|
|
||||||
xdg = "2.1.0"
|
|
||||||
|
|
||||||
[target.'cfg(target_os="linux")'.dependencies]
|
|
||||||
notify-rust = { version = "^4", default-features = false, features = ["dbus", ], optional = true }
|
|
||||||
|
|
||||||
[build-dependencies]
|
|
||||||
flate2 = { version = "1", optional = true }
|
|
||||||
proc-macro2 = "1.0.37"
|
|
||||||
quote = "^1.0"
|
|
||||||
regex = "1"
|
|
||||||
syn = { version = "1", features = [] }
|
|
||||||
|
|
||||||
[dev-dependencies]
|
|
||||||
flate2 = { version = "1" }
|
|
||||||
regex = "1"
|
|
||||||
tempfile = "3.3"
|
|
||||||
|
|
||||||
[profile.release]
|
[profile.release]
|
||||||
lto = "fat"
|
lto = "fat"
|
||||||
|
@ -76,22 +11,3 @@ codegen-units = 1
|
||||||
opt-level = "s"
|
opt-level = "s"
|
||||||
debug = false
|
debug = false
|
||||||
strip = true
|
strip = true
|
||||||
|
|
||||||
[workspace]
|
|
||||||
members = ["melib", "tools", ]
|
|
||||||
|
|
||||||
[features]
|
|
||||||
default = ["sqlite3", "notmuch", "regexp", "smtp", "dbus-notifications", "gpgme", "cli-docs"]
|
|
||||||
notmuch = ["melib/notmuch_backend", ]
|
|
||||||
jmap = ["melib/jmap_backend",]
|
|
||||||
sqlite3 = ["melib/sqlite3"]
|
|
||||||
smtp = ["melib/smtp"]
|
|
||||||
regexp = ["pcre2"]
|
|
||||||
dbus-notifications = ["notify-rust",]
|
|
||||||
cli-docs = ["flate2"]
|
|
||||||
svgscreenshot = ["svg_crate"]
|
|
||||||
gpgme = ["melib/gpgme"]
|
|
||||||
|
|
||||||
# Print tracing logs as meli runs in stderr
|
|
||||||
# enable for debug tracing logs: build with --features=debug-tracing
|
|
||||||
debug-tracing = ["melib/debug-tracing", ]
|
|
||||||
|
|
2
Makefile
|
@ -32,7 +32,7 @@ BINDIR ?= ${EXPANDED_PREFIX}/bin
|
||||||
MANDIR ?= ${EXPANDED_PREFIX}/share/man
|
MANDIR ?= ${EXPANDED_PREFIX}/share/man
|
||||||
|
|
||||||
# Installation parameters
|
# Installation parameters
|
||||||
DOCS_SUBDIR ?= docs/
|
DOCS_SUBDIR ?= meli/docs/
|
||||||
MANPAGES ?= meli.1 meli.conf.5 meli-themes.5
|
MANPAGES ?= meli.1 meli.conf.5 meli-themes.5
|
||||||
FEATURES ?= --features "${MELI_FEATURES}"
|
FEATURES ?= --features "${MELI_FEATURES}"
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,87 @@
|
||||||
|
[package]
|
||||||
|
name = "meli"
|
||||||
|
version = "0.7.3"
|
||||||
|
authors = ["Manos Pitsidianakis <manos@pitsidianak.is>"]
|
||||||
|
edition = "2018"
|
||||||
|
rust-version = "1.65.0"
|
||||||
|
|
||||||
|
license = "GPL-3.0-or-later"
|
||||||
|
readme = "README.md"
|
||||||
|
description = "terminal mail client"
|
||||||
|
homepage = "https://meli.delivery"
|
||||||
|
repository = "https://git.meli.delivery/meli/meli.git"
|
||||||
|
keywords = ["mail", "mua", "maildir", "terminal", "imap"]
|
||||||
|
categories = ["command-line-utilities", "email"]
|
||||||
|
default-run = "meli"
|
||||||
|
|
||||||
|
[[bin]]
|
||||||
|
name = "meli"
|
||||||
|
path = "src/main.rs"
|
||||||
|
|
||||||
|
[lib]
|
||||||
|
name = "meli"
|
||||||
|
path = "src/lib.rs"
|
||||||
|
|
||||||
|
[[bin]]
|
||||||
|
name = "managesieve-client"
|
||||||
|
path = "src/managesieve.rs"
|
||||||
|
required-features = ["melib/imap_backend"]
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
async-task = "^4.2.0"
|
||||||
|
bitflags = "1.0"
|
||||||
|
crossbeam = { version = "^0.8" }
|
||||||
|
flate2 = { version = "1", optional = true }
|
||||||
|
futures = "0.3.5"
|
||||||
|
indexmap = { version = "^1.6", features = ["serde-1", ] }
|
||||||
|
libc = { version = "0.2.125", default-features = false, features = ["extra_traits",] }
|
||||||
|
linkify = { version = "^0.8", default-features = false }
|
||||||
|
melib = { path = "../melib", version = "0.8.0" }
|
||||||
|
nix = { version = "^0.24", default-features = false }
|
||||||
|
notify = { version = "4.0.1", default-features = false } # >:c
|
||||||
|
num_cpus = "1.12.0"
|
||||||
|
pcre2 = { version = "0.2.3", optional = true }
|
||||||
|
|
||||||
|
serde = "1.0.71"
|
||||||
|
serde_derive = "1.0.71"
|
||||||
|
serde_json = "1.0"
|
||||||
|
signal-hook = { version = "^0.3", default-features = false }
|
||||||
|
signal-hook-registry = { version = "1.2.0", default-features = false }
|
||||||
|
smallvec = { version = "^1.5.0", features = ["serde", ] }
|
||||||
|
structopt = { version = "0.3.14", default-features = false }
|
||||||
|
svg_crate = { version = "^0.13", optional = true, package = "svg" }
|
||||||
|
termion = { version = "1.5.1", default-features = false }
|
||||||
|
toml = { version = "0.5.6", default-features = false, features = ["preserve_order", ] }
|
||||||
|
unicode-segmentation = "1.2.1" # >:c
|
||||||
|
xdg = "2.1.0"
|
||||||
|
|
||||||
|
[target.'cfg(target_os="linux")'.dependencies]
|
||||||
|
notify-rust = { version = "^4", default-features = false, features = ["dbus", ], optional = true }
|
||||||
|
|
||||||
|
[build-dependencies]
|
||||||
|
flate2 = { version = "1", optional = true }
|
||||||
|
proc-macro2 = "1.0.37"
|
||||||
|
quote = "^1.0"
|
||||||
|
regex = "1"
|
||||||
|
syn = { version = "1", features = [] }
|
||||||
|
|
||||||
|
[dev-dependencies]
|
||||||
|
flate2 = { version = "1" }
|
||||||
|
regex = "1"
|
||||||
|
tempfile = "3.3"
|
||||||
|
|
||||||
|
[features]
|
||||||
|
default = ["sqlite3", "notmuch", "regexp", "smtp", "dbus-notifications", "gpgme", "cli-docs"]
|
||||||
|
notmuch = ["melib/notmuch_backend", ]
|
||||||
|
jmap = ["melib/jmap_backend",]
|
||||||
|
sqlite3 = ["melib/sqlite3"]
|
||||||
|
smtp = ["melib/smtp"]
|
||||||
|
regexp = ["pcre2"]
|
||||||
|
dbus-notifications = ["notify-rust",]
|
||||||
|
cli-docs = ["flate2"]
|
||||||
|
svgscreenshot = ["svg_crate"]
|
||||||
|
gpgme = ["melib/gpgme"]
|
||||||
|
|
||||||
|
# Print tracing logs as meli runs in stderr
|
||||||
|
# enable for debug tracing logs: build with --features=debug-tracing
|
||||||
|
debug-tracing = ["melib/debug-tracing", ]
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 33 KiB |
Before Width: | Height: | Size: 204 KiB After Width: | Height: | Size: 204 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 50 KiB |
|
@ -1,8 +1,7 @@
|
||||||
[package]
|
[package]
|
||||||
name = "melib"
|
name = "melib"
|
||||||
version = "0.7.2"
|
version = "0.8.0"
|
||||||
authors = ["Manos Pitsidianakis <epilys@nessuent.xyz>"]
|
authors = ["Manos Pitsidianakis <manos@pitsidianak.is>"]
|
||||||
workspace = ".."
|
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
build = "build.rs"
|
build = "build.rs"
|
||||||
rust-version = "1.65.0"
|
rust-version = "1.65.0"
|
||||||
|
|
|
@ -180,9 +180,6 @@ impl StderrLogger {
|
||||||
level: Arc::new(AtomicU8::new(level as u8)),
|
level: Arc::new(AtomicU8::new(level as u8)),
|
||||||
print_level: true,
|
print_level: true,
|
||||||
print_module_names: true,
|
print_module_names: true,
|
||||||
#[cfg(feature = "debug-tracing")]
|
|
||||||
debug_dest: Destination::Stderr,
|
|
||||||
#[cfg(not(feature = "debug-tracing"))]
|
|
||||||
debug_dest: Destination::None,
|
debug_dest: Destination::None,
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|