buildRustCrate: add heuristic to picking the right binary source files #46210
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@GrahamcOfBorg build way-cooler cargo-update cargo-download cargo-vendor cargo-edit carnix |
|
Failure on aarch64-linux (full log) Attempted: way-cooler, cargo-update, cargo-download, cargo-vendor, cargo-edit, carnix Partial log (click to expand)
|
|
Failure on x86_64-darwin (full log) Attempted: cargo-update, cargo-download, cargo-vendor, cargo-edit, carnix The following builds were skipped because they don't evaluate on x86_64-darwin: way-cooler Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: way-cooler, cargo-update, cargo-download, cargo-vendor, cargo-edit, carnix Partial log (click to expand)
|
Mic92
reviewed
Sep 7, 2018
|
|
||
| # the first two cases are the "new" default IIRC | ||
| BIN_NAME_=$(echo $BIN_NAME | sed -e 's/_/-/g') | ||
| FILES="src/bin/$BIN_NAME_.rs src/bin/$BIN_NAME_/main.rs src/bin/main.rs src/main.rs" |
There was a problem hiding this comment.
Probably should be an array instead. I'll dig how to do that with bash.
Mic92
reviewed
Sep 7, 2018
andir
force-pushed
the
build-rust-crate-changes
branch
from
201c1a5
to
8e07e16
Compare
|
I started restructuring the |
|
@GrahamcOfBorg build buildRustCrateTests |
|
Success on x86_64-darwin (full log) Attempted: buildRustCrateTests Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: buildRustCrateTests Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: buildRustCrateTests Partial log (click to expand)
|
GrahamcOfBorg
added
8.has: package (new)
10.rebuild-linux: 11-100
and removed
10.rebuild-linux: 1-10
labels
andir
force-pushed
the
build-rust-crate-changes
branch
from
8e07e16
to
d4edaa5
Compare
andir
changed the title
|
I started playing with this a bit more and it seems that there is still a lot of headroom to improve in regards to what carnix produces and what we are able to properly build.. The |
Mic92
approved these changes
Sep 12, 2018
Cargo has a few odd (old) ways of picking source files if the `bin.path`
attribute isn't given in the Cargo.toml. This commit adds support for
some of those. The previous behaviour always defaulted to `src/main.rs`
which was not always the right choice.
Since there is look-ahead into the unpacked sources before running the
actual builder the path selection logic has to be embedded within the
build script.
`buildRustCrate` currently supports two ways of running building
binaries when processing a crate:
- Explicit definition of all the binaries (& optionally the paths to
their respective `main.rs`) and,
- if not binary was explictly configured all files matching the patterns
`src/main.rs`, `src/bin/*.rs`.
When the explicit list is given without path information paths are now
being picked from a list of candidates. The first match wins. The order
is the same as within the cargo compatibility code.
If the crate does not provide any libraries the path `src/{bin_name}.rs`
is also considered.
All underscores within the binary names are translated into dashes (`-`)
before the lookups are made. This seems to be a common convention.
The build expression got quiet large over time and to make it a bit easier to grasp the different scripts involved in the build are now separated from the nix file.
andir
force-pushed
the
build-rust-crate-changes
branch
from
d4edaa5
to
65d62b6
Compare
This commit adds test based on real-world crates (brotli). There were a few more edge cases that were missing beforehand. Also it turned out that we can get rid of the `finalBins` list since that will now be handled during runtime.
andir
force-pushed
the
build-rust-crate-changes
branch
from
65d62b6
to
fc5e595
Compare
andir
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Cargo has a few odd (old) ways of picking source files if the
bin.pathattribute isn't given in the Cargo.toml. This commit adds support for
some of those. The previous behaviour always defaulted to
src/main.rswhich was not always the right choice.
Since there is look-ahead into the unpacked sources before running the
actual builder the path selection logic has to be embedded within the
build script.
buildRustCratecurrently supports two ways of running buildingbinaries when processing a crate:
their respective
main.rs) and,src/main.rs,src/bin/*.rs.When the explicit list is given without path information paths are now
being picked from a list of candidates. The first match wins. The order
is the same as within the cargo compatibility code.
If the crate does not provide any libraries the path
src/{bin_name}.rsis also considered.
All underscores within the binary names are translated into dashes (
-)before the lookups are made. This seems to be a common convention.
cc some of the people that touched the code before me: @shlevy @Mic92
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)