ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

cargo: stop cargo install from installing fake-editor & co.

Browse source 
Among other things, this prevented `jj` from working with
`cargo binstall`.

The trick is taken from
https://github.com/rust-lang/cargo/issues/2911#issuecomment-1483256987.

We could now also remove `--bin jj` from the installation commands
in `install-and-setup.md`, but I'm not sure we should. That argument
makes it clear that the binary is `jj`, not `jj-cli`.

Fixes #216.
This commit is contained in:
Ilya Grigoriev 2023-09-19 22:30:34 -07:00
parent 6f53d3a103
commit d79e8293aa
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -1023,6 +1023,7 @@ dependencies = [
"indexmap 2.0.0", "indexmap 2.0.0",
"insta", "insta",
"itertools 0.11.0", "itertools 0.11.0",
"jj-cli",
"jj-lib", "jj-lib",
"libc", "libc",
"maplit", "maplit",

5
cli/Cargo.toml
View file

@ -19,10 +19,12 @@ path = "src/main.rs"
[[bin]] [[bin]]
name = "fake-editor" name = "fake-editor"
path = "testing/fake-editor.rs" path = "testing/fake-editor.rs"
required-features = ["test-fakes"]
[[bin]] [[bin]]
name = "fake-diff-editor" name = "fake-diff-editor"
path = "testing/fake-diff-editor.rs" path = "testing/fake-diff-editor.rs"
required-features = ["test-fakes"]
[build-dependencies] [build-dependencies]
cargo_metadata = { workspace = true } cargo_metadata = { workspace = true }
@ -72,10 +74,13 @@ assert_matches = { workspace = true }
insta = { workspace = true } insta = { workspace = true }
test-case = { workspace = true } test-case = { workspace = true }
testutils = { workspace = true } testutils = { workspace = true }
# https://github.com/rust-lang/cargo/issues/2911#issuecomment-1483256987
jj-cli = { path = ".", features = ["test-fakes"], default-features = false }
[features] [features]
default = ["watchman"] default = ["watchman"]
bench = ["dep:criterion"] bench = ["dep:criterion"]
packaging = [] packaging = []
test-fakes = []
vendored-openssl = ["git2/vendored-openssl", "jj-lib/vendored-openssl"] vendored-openssl = ["git2/vendored-openssl", "jj-lib/vendored-openssl"]
watchman = ["jj-lib/watchman"] watchman = ["jj-lib/watchman"]