Skip to content

/ servo

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.

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

Move the root Cargo.toml to components/servo, and warn when Cargo is run directly #4140

Merged
merged 7 commits into from Dec 3, 2014
Merged

Move the root Cargo.toml to components/servo, and warn when Cargo is run directly #4140

merged 7 commits into from Dec 3, 2014
+136 −98

Conversation

@SimonSapin
Copy link
Member

SimonSapin commented Nov 28, 2014

This fixes #3957, and allow #4115 not to regress #4099.
@SimonSapin SimonSapin mentioned this pull request Nov 28, 2014
Closed
@SimonSapin
Copy link
Member Author

SimonSapin commented Nov 28, 2014

The output of cargo build looks like

   Compiling not-the-toml-you-re-looking-for v0.0.1 (file:///home/simon/projects/servo)
Failed to run custom build command for `not-the-toml-you-re-looking-for v0.0.1 (file:///home/simon/projects/servo)`
Process didn't exit successfully: `/home/simon/projects/servo/target/build/not-the-toml-you-re-looking-for-bbedc97bda2e30a8/build-script-not-the-toml-you-re-looking-for` (status=1)
--- stderr


    This is not the `Cargo.toml` file you're looking for.
    Invoke Cargo through mach instead, e.g. `./mach build`.

Feel free to suggest changes to the error message.
@Manishearth Manishearth closed this Dec 2, 2014
@Manishearth Manishearth reopened this Dec 2, 2014
@hoppipolla-critic-bot
Copy link

hoppipolla-critic-bot commented Dec 2, 2014

Critic review: https://critic.hoppipolla.co.uk/r/3342

This is an external review system which you may optionally use for the code review of your pull request.

In order to help critic track your changes, please do not make in-place history rewrites (e.g. via git rebase -i or git commit --amend) when updating this pull request.
bors-servo pushed a commit that referenced this pull request Dec 2, 2014
bors-servo
auto merge of #4140 : SimonSapin/servo/no-root-cargo-toml, r=Manishearth
Loading status checks…
c8fd6f7 
This fixes #3957, and allow #4115 not to regress #4099.
bors-servo pushed a commit that referenced this pull request Dec 2, 2014
bors-servo
auto merge of #4140 : SimonSapin/servo/no-root-cargo-toml, r=Manishearth
Loading status checks…
7f01b0e 
This fixes #3957, and allow #4115 not to regress #4099.
bors-servo pushed a commit that referenced this pull request Dec 3, 2014
bors-servo
auto merge of #4140 : SimonSapin/servo/no-root-cargo-toml, r=mbrubeck
Loading status checks…
a51aca4 
This fixes #3957, and allow #4115 not to regress #4099.
bors-servo pushed a commit that referenced this pull request Dec 3, 2014
bors-servo
auto merge of #4140 : SimonSapin/servo/no-root-cargo-toml, r=Manishearth
Loading status checks…
991d238 
This fixes #3957, and allow #4115 not to regress #4099.
SimonSapin added 6 commits Nov 28, 2014
@SimonSapin
Move the servo crate from root to components/servo
2f413c8
@SimonSapin
Warn when Cargo is run directly. Fix #3957.
ff4877b
@SimonSapin
Make build system more independent of current directory.
cc4ea75
@SimonSapin
Have `./mach cargo` not change to `components/servo`.
14e28f6 
`ports/android/glut` relies on it executing on the current directory.
@SimonSapin
Fix up android/glut port to find its servo dependency.
26cd2b4
@SimonSapin
Don’t try to run unit tests for the servo crate.
Loading status checks…
9bbc633 
There are none, but the contenttest program fails with:

```
task '<main>' panicked at 'Required option 'source-dir' missing.', ../../tests/contenttest.rs:48
```
@SimonSapin SimonSapin force-pushed the SimonSapin:no-root-cargo-toml branch from 8e15b5f to 9bbc633 Dec 3, 2014
@Manishearth

This comment has been minimized.

Sign in to view
Copy link

Manishearth commented on 9bbc633 Dec 3, 2014

r+
@bors-servo

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo commented on 9bbc633 Dec 3, 2014

saw approval from Manishearth
at SimonSapin@9bbc633

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Dec 3, 2014

merging SimonSapin/servo/no-root-cargo-toml = 9bbc633 into auto

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Dec 3, 2014

SimonSapin/servo/no-root-cargo-toml = 9bbc633 merged ok, testing candidate = 2de1835

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Dec 3, 2014

some tests failed:
failure: http://build.servo.org/builders/mac2/builds/330
bors-servo pushed a commit that referenced this pull request Dec 3, 2014
bors-servo
auto merge of #4140 : SimonSapin/servo/no-root-cargo-toml, r=Manishearth
Loading status checks…
2de1835 
This fixes #3957, and allow #4115 not to regress #4099.
@SimonSapin
More target path fixup.
Loading status checks…
e1c2210
@SimonSapin

This comment has been minimized.

Sign in to view
Copy link
Owner Author

SimonSapin commented on e1c2210 Dec 3, 2014

r+
@bors-servo

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo commented on e1c2210 Dec 3, 2014

saw approval from SimonSapin
at SimonSapin@e1c2210

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Dec 3, 2014

merging SimonSapin/servo/no-root-cargo-toml = e1c2210 into auto

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Dec 3, 2014

SimonSapin/servo/no-root-cargo-toml = e1c2210 merged ok, testing candidate = 873ca6c

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Dec 3, 2014

all tests pass:
success: http://build.servo.org/builders/linux1/builds/114
success: http://build.servo.org/builders/linux2/builds/114
success: http://build.servo.org/builders/android/builds/181
success: http://build.servo.org/builders/mac1/builds/331
success: http://build.servo.org/builders/mac2/builds/331

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Dec 3, 2014

fast-forwarding master to auto = 873ca6c
bors-servo pushed a commit that referenced this pull request Dec 3, 2014
bors-servo
auto merge of #4140 : SimonSapin/servo/no-root-cargo-toml, r=SimonSapin
Loading status checks…
873ca6c 
This fixes #3957, and allow #4115 not to regress #4099.
@bors-servo bors-servo closed this Dec 3, 2014
@bors-servo bors-servo merged commit e1c2210 into servo:master Dec 3, 2014
1 check passed
1 check passed
default all tests passed
@SimonSapin SimonSapin deleted the SimonSapin:no-root-cargo-toml branch Dec 3, 2014
This was referenced Dec 3, 2014
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

Warn when people run `cargo build` directly
5 participants
@SimonSapin @hoppipolla-critic-bot @bors-servo @Manishearth @jdm
You can’t perform that action at this time.