Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[RFC] build: switch back to gix/max-performance-safe feature by default #5047

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+14 −15
Open

[RFC] build: switch back to gix/max-performance-safe feature by default #5047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ba29ca
build: switch back to `gix/max-performance-safe` feature by default
arxanas Dec 7, 2024
defa823
docs: revert "docs: update installation docs to say that `cmake` is n…
arxanas Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ gix = { version = "0.68.0", default-features = false, features = [
"attributes",
"blob-diff",
"index",
"max-performance",
"max-performance-safe",
] }
glob = "0.3.1"
hashbrown = { version = "0.15.2", default-features = false, features = ["inline-more"] }
Expand Down
3 changes: 2 additions & 1 deletion cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ jj-cli = { path = ".", features = ["test-fakes"], default-features = false }
[features]
default = ["watchman"]
bench = ["dep:criterion"]
packaging = []
gix-max-performance = ["jj-lib/gix-max-performance"]
packaging = ["gix-max-performance"]
test-fakes = ["jj-lib/testing"]
vendored-openssl = ["git2/vendored-openssl", "jj-lib/vendored-openssl"]
watchman = ["jj-lib/watchman"]
Expand Down
18 changes: 5 additions & 13 deletions docs/install-and-setup.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ be compiled from the same source code.

#### From Source

First make sure that you have a Rust version >= 1.76 and that the `cmake`,
`libssl-dev`, `openssl`, `pkg-config`, and `build-essential` packages are
installed by running something like this:
First make sure that you have a Rust version >= 1.76 and that the `libssl-dev`,
`openssl`, `pkg-config`, and `build-essential` packages are installed by running
something like this:

```shell
sudo apt-get install cmake libssl-dev openssl pkg-config build-essential
sudo apt-get install libssl-dev openssl pkg-config build-essential
```

Now run either:
Expand Down Expand Up @@ -139,7 +139,6 @@ these:

```shell
xcode-select --install
brew install cmake
brew install openssl
brew install pkg-config
export PKG_CONFIG_PATH="$(brew --prefix)/opt/openssl@3/lib/pkgconfig"
Expand Down Expand Up @@ -181,14 +180,7 @@ sudo port install jujutsu

### Windows

First make sure that you have a Rust version >= 1.76. You will also need
`cmake`, which you can install by running this:

```shell
winget install cmake
```

Now run either:
First make sure that you have a Rust version >= 1.76. Now run either:

```shell
# To install the *prerelease* version from the main branch
Expand Down
6 changes: 6 additions & 0 deletions lib/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,12 @@ tokio = { workspace = true, features = ["full"] }
[features]
default = ["git"]
git = ["dep:git2", "dep:gix"]
gix-max-performance = [
# Requires `cmake` as a build dependency.
# Note that this feature is different from `gix/max-performance-safe`.
# See: https://docs.rs/gix/latest/gix/#performance
"gix/max-performance",
]
vendored-openssl = ["git2/vendored-openssl"]
watchman = ["dep:tokio", "dep:watchman_client"]
testing = ["git"]
Expand Down
Loading