forked from servo/servo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
auto merge of servo#4140 : SimonSapin/servo/no-root-cargo-toml, r=Sim…
…onSapin This fixes servo#3957, and allow servo#4115 not to regress servo#4099.
- Loading branch information
Showing
18 changed files
with
136 additions
and
98 deletions.
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,69 +1,10 @@ | ||
[package] | ||
|
||
name = "servo" | ||
name = "not-the-toml-you-re-looking-for" | ||
version = "0.0.1" | ||
authors = ["The Servo Project Developers"] | ||
|
||
[lib] | ||
name = "servo" | ||
crate-type = ["rlib"] | ||
|
||
[[bin]] | ||
name = "servo" | ||
test = false | ||
doc = false | ||
bench = false | ||
|
||
[[test]] | ||
name = "reftest" | ||
path = "tests/reftest.rs" | ||
harness = false | ||
|
||
[[test]] | ||
name = "contenttest" | ||
path = "tests/contenttest.rs" | ||
harness = false | ||
|
||
[features] | ||
default = ["glfw_app"] | ||
glutin = ["glutin_app"] | ||
|
||
[dependencies.compositing] | ||
path = "components/compositing" | ||
|
||
[dependencies.net] | ||
path = "components/net" | ||
|
||
[dependencies.msg] | ||
path = "components/msg" | ||
|
||
[dependencies.util] | ||
path = "components/util" | ||
build = "support/not-the-toml-you-re-looking-for.rs" | ||
|
||
[dependencies.script] | ||
path = "components/script" | ||
|
||
[dependencies.layout] | ||
path = "components/layout" | ||
|
||
[dependencies.gfx] | ||
path = "components/gfx" | ||
|
||
[dependencies.glfw_app] | ||
path = "ports/glfw" | ||
optional = true | ||
|
||
[dependencies.glutin_app] | ||
path = "ports/glutin" | ||
optional = true | ||
|
||
[dependencies.url] | ||
git = "https://github.com/servo/rust-url" | ||
|
||
[dependencies.green] | ||
git = "https://github.com/servo/green-rs" | ||
branch = "servo" | ||
|
||
[dependencies.rustuv] | ||
git = "https://github.com/servo/green-rs" | ||
branch = "servo" | ||
[lib] | ||
name = "not-the-toml-you-re-looking-for" |
File renamed without changes.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
[package] | ||
|
||
name = "servo" | ||
version = "0.0.1" | ||
authors = ["The Servo Project Developers"] | ||
|
||
[lib] | ||
name = "servo" | ||
path = "lib.rs" | ||
crate-type = ["rlib"] | ||
|
||
[[bin]] | ||
name = "servo" | ||
path = "main.rs" | ||
test = false | ||
doc = false | ||
bench = false | ||
|
||
[[test]] | ||
name = "reftest" | ||
path = "../../tests/reftest.rs" | ||
harness = false | ||
|
||
[[test]] | ||
name = "contenttest" | ||
path = "../../tests/contenttest.rs" | ||
harness = false | ||
|
||
[features] | ||
default = ["glfw_app"] | ||
glutin = ["glutin_app"] | ||
|
||
[dependencies.compositing] | ||
path = "../compositing" | ||
|
||
[dependencies.net] | ||
path = "../net" | ||
|
||
[dependencies.msg] | ||
path = "../msg" | ||
|
||
[dependencies.util] | ||
path = "../util" | ||
|
||
[dependencies.script] | ||
path = "../script" | ||
|
||
[dependencies.layout] | ||
path = "../layout" | ||
|
||
[dependencies.gfx] | ||
path = "../gfx" | ||
|
||
[dependencies.glfw_app] | ||
path = "../../ports/glfw" | ||
optional = true | ||
|
||
[dependencies.glutin_app] | ||
path = "../../ports/glutin" | ||
optional = true | ||
|
||
[dependencies.url] | ||
git = "https://github.com/servo/rust-url" | ||
|
||
[dependencies.green] | ||
git = "https://github.com/servo/green-rs" | ||
branch = "servo" | ||
|
||
[dependencies.rustuv] | ||
git = "https://github.com/servo/green-rs" | ||
branch = "servo" |
File renamed without changes.
File renamed without changes.
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
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
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
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
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
fn main() { | ||
::std::os::set_exit_status(1); | ||
let _ = ::std::io::stderr().write(br" | ||
This is not the `Cargo.toml` file you're looking for. | ||
Invoke Cargo through mach instead, e.g. `./mach build`. | ||
"); | ||
} |
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
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
Oops, something went wrong.