History

Remove all targets we don't want anymore (#215)

- remove termion support for linux, use crossterm everywhere. - remove additional 'light' intermediate targets

Sebastian Thiel committed 4 years ago

Commit 2abba9c1 parent 050964d4 files · +11 −66Browse files

Unified · Split

4 files
  1. Cargo.lock +0 −29
  2. Cargo.toml +3 −8
  3. Makefile +2 −17
  4. cargo-features.md +6 −12
Cargo.lock+0−29
@@ -759,7 +759,6 @@ dependencies = [ · 758 unmodified lines
759759 "futures-channel",
760760 "futures-core",
761761 "futures-lite",
762− "termion",
763762 "tui",
764763 "tui-react",
765764 ]
@@ -2349,12 +2348,6 @@ dependencies = [ · 1583 unmodified lines
23492348 "libc",
23502349 ]
23512350
2352−[[package]]
2353−name = "numtoa"
2354−version = "0.1.0"
2355−source = "registry+https://github.com/rust-lang/crates.io-index"
2356−checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef"
2357−
23582351 [[package]]
23592352 name = "object-access"
23602353 version = "0.1.0"
@@ -2771,15 +2764,6 @@ dependencies = [ · 410 unmodified lines
27712764 "bitflags",
27722765 ]
27732766
2774−[[package]]
2775−name = "redox_termios"
2776−version = "0.1.2"
2777−source = "registry+https://github.com/rust-lang/crates.io-index"
2778−checksum = "8440d8acb4fd3d277125b4bd01a6f38aee8d814b3b5fc09b3f2b825d37d3fe8f"
2779−dependencies = [
2780− "redox_syscall",
2781−]
2782−
27832767 [[package]]
27842768 name = "redox_users"
27852769 version = "0.4.0"
@@ -3116,18 +3100,6 @@ dependencies = [ · 330 unmodified lines
31163100 "winapi",
31173101 ]
31183102
3119−[[package]]
3120−name = "termion"
3121−version = "1.5.6"
3122−source = "registry+https://github.com/rust-lang/crates.io-index"
3123−checksum = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e"
3124−dependencies = [
3125− "libc",
3126− "numtoa",
3127− "redox_syscall",
3128− "redox_termios",
3129−]
3130−
31313103 [[package]]
31323104 name = "textwrap"
31333105 version = "0.11.0"
@@ -3283,7 +3255,6 @@ dependencies = [ · 149 unmodified lines
32833255 "bitflags",
32843256 "cassowary",
32853257 "crossterm",
3286− "termion",
32873258 "unicode-segmentation",
32883259 "unicode-width",
32893260 ]
Cargo.toml+3−8
@@ -28,14 +28,11 @@ doctest = false · 27 unmodified lines
2828 default = ["max"]
2929
3030 max = ["fast", "pretty-cli", "prodash/render-tui-crossterm", "prodash-render-line-crossterm", "prodash/render-line-autoconfigure", "http-client-curl", "gitoxide-core-tools", "gitoxide-core-blocking-client"]
31−max-termion = ["fast", "pretty-cli", "prodash/render-tui-termion", "prodash-render-line-termion", "prodash/render-line-autoconfigure", "http-client-curl", "gitoxide-core-tools", "gitoxide-core-blocking-client"]
3231
33−lean = ["fast", "lean-cli", "prodash-render-line-crossterm", "prodash/progress-tree", "http-client-curl", "gitoxide-core-tools", "gitoxide-core-blocking-client"]
34−lean-termion = ["fast", "lean-cli", "prodash-render-line-termion", "prodash/progress-tree", "http-client-curl", "gitoxide-core-tools", "gitoxide-core-blocking-client"]
32+lean = ["fast", "pretty-cli", "prodash-render-line-crossterm", "prodash/progress-tree", "http-client-curl", "gitoxide-core-tools", "gitoxide-core-blocking-client"]
33+lean-async = ["fast", "pretty-cli", "prodash-render-line-crossterm", "prodash/progress-tree", "http-client-curl", "gitoxide-core-tools", "gitoxide-core-async-client"]
3534
36−light = ["fast", "lean-cli", "gitoxide-core-tools", "gitoxide-core-blocking-client"]
37−light-async = ["fast", "lean-cli", "gitoxide-core-tools", "gitoxide-core-async-client"]
38−small = ["lean-cli", "git-features/rustsha1", "git-features/zlib-rust-backend"]
35+small = ["pretty-cli", "git-features/rustsha1", "git-features/zlib-rust-backend"]
3936
4037 gitoxide-core-tools = ["gitoxide-core/organize", "gitoxide-core/estimate-hours"]
4138 gitoxide-core-blocking-client = ["gitoxide-core/blocking-client"]
@@ -53,10 +50,8 @@ pretty-cli = ["clap", · 11 unmodified lines
5350 "gitoxide-core/local-time-support",
5451 "env_logger",
5552 "futures-lite"]
56−lean-cli = ["argh", "prodash/progress-log", "env_logger" ]
5753
5854 prodash-render-line-crossterm = ["prodash-render-line", "prodash/render-line-crossterm", "atty", "crosstermion"]
59−prodash-render-line-termion = ["prodash-render-line", "prodash/render-line-termion", "atty", "crosstermion"]
6055
6156 # internal
6257 prodash-render-tui = ["prodash/render-tui"]
Makefile+2−17
@@ -22,15 +22,9 @@ release-all: release release-lean release-small ## all release builds · 21 unmodified lines
2222 release: always ## the default build, big but pretty (builds in ~2min 35s)
2323 cargo build --release
2424
25−release-unix: always ## the default build, big but pretty, unix only (builds in ~2min 35s)
26− cargo build --release --no-default-features --features max-termion
27−
2825 release-lean: always ## lean and fast, with line renderer (builds in ~1min 30s)
2926 cargo build --release --no-default-features --features lean
3027
31−release-light: always ## lean and fast, log only (builds in ~1min 14s)
32− cargo build --release --no-default-features --features light
33−
3428 release-small: always ## minimal dependencies, at cost of performance (builds in ~46s)
3529 cargo build --release --no-default-features --features small
3630
@@ -39,15 +33,9 @@ release-small: always ## minimal dependencies, at cost of performance (builds in · 2 unmodified lines
3933 debug: always ## the default build, big but pretty
4034 cargo build
4135
42−debug-unix: always ## the default build, big but pretty, unix only
43− cargo build --no-default-features --features max-termion
44−
4536 debug-lean: always ## lean and fast, with line renderer
4637 cargo build --no-default-features --features lean
4738
48−debug-light: always ## lean and fast
49− cargo build --no-default-features --features light
50−
5139 debug-small: always ## minimal dependencies, at cost of performance
5240 cargo build --no-default-features --features small
5341
@@ -79,13 +67,10 @@ clippy: ## Run cargo clippy on all crates · 25 unmodified lines
7967 check: ## Build all code in suitable configurations
8068 cargo check --all
8169 cargo check --no-default-features --features small
82− cargo check --no-default-features --features light
83− cargo check --no-default-features --features light-async
84− if cargo check --features light-async 2>/dev/null; then false; else true; fi
70+ if cargo check --features lean-async 2>/dev/null; then false; else true; fi
8571 cargo check --no-default-features --features lean
86− cargo check --no-default-features --features lean-termion
72+ cargo check --no-default-features --features lean-async
8773 cargo check --no-default-features --features max
88− cargo check --no-default-features --features max-termion
8974 cd git-actor && cargo check \
9075 && cargo check --features local-time-support
9176 cd gitoxide-core && cargo check \
cargo-features.md+6−12
@@ -23,7 +23,7 @@ The top-level command-line interface. · 22 unmodified lines
2323 * Use `argh` to produce a usable binary with decent documentation that is smallest in size, usually 300kb less than `pretty-cli`.
2424 * If `pretty-cli` is enabled as well, `lean-cli` will take precedence, and you pay for building unnecessary dependencies.
2525 * provides a line renderer for lean but pretty progress
26−* **prodash-render-line-crossterm** or **prodash-render-line-termion** _(mutually exclusive)_
26+* **prodash-render-line-crossterm**
2727 * The `--verbose` flag will be powered by an interactive progress mechanism that doubles as log as well as interactive progress
2828 that appears after a short duration.
2929 * **gitoxide-core-tools**
@@ -37,20 +37,14 @@ The top-level command-line interface. · 7 unmodified lines
3737
3838 There are **convenience features**, which combine common choices of the above into one name
3939
40−* **max** = *pretty-cli* + *fast* + *prodash-render-tui-crossterm* + *http* + *gitoxide-core-tools* + *client-networking*
40+* **max** = *fast* + *prodash-render-tui-crossterm* + *prodash-render-line-crossterm* + *http* + *gitoxide-core-tools* + *client-networking*
4141 * _default_, for unix and windows
42−* **max-termion** = *pretty-cli* + *fast* + *prodash-render-tui-termion* + *http* + *gitoxide-core-tools* + *client-networking*
43− * for unix only, faster compile times, a little smaller
44−* **lean** = *lean-cli* + *fast* + *prodash-render-line-crossterm* + *gitoxide-core-tools* + *client-networking*
45− * for unix and windows, significantly smaller than _max_, but without `--progress` terminal user interface.
46−* **lean-termion** = *lean-cli* + *fast* + *prodash-render-line-termion* + *gitoxide-core-tools* + *client-networking*
47− * for unix only, faster compile times, a little smaller
48−* **light** = *lean-cli* + *fast* + *gitoxide-core-tools* + *client-networking*
49− * crossplatform by nature as this comes with simplified log based progress
50−* **light-async** = *lean-cli* + *fast* + *gitoxide-core-tools* + *client-async-networking*
42+* **lean** = *fast* + *prodash-render-line-crossterm* + *gitoxide-core-tools* + *client-networking*
43+ * cross-platform by nature as this comes with simplified log based progress
44+* **lean-async** = *fast* + *prodash-render-line-crossterm* + *gitoxide-core-tools* + *client-async-networking*
5145 * Due to async client-networking not being implemented for most transports, this one supports only the 'git' transport. It uses, however, a fully asynchronous
5246 networking implementation which can serve a real-world example on how to implement custom async transports.
53−* **small** = *lean-cli*
47+* **small**
5448 * As small as it can possibly be, no threading, no fast sha1, log based progress only, no cleanup of temporary files on interrupt, rust based zlib implementation.
5549 * no networking, local operations only.
5650