Use the same build environment and features for CEF, Servo, Gonk, Geckolib #11122

mbrubeck · 2016-05-10T23:37:35Z

Remove unnecessary dependencies and features from top-level Cargo.tomls. The features for each crate will be computed based on the union of features specified in the dependency graph. Specifying the same ones again just adds more ways for them to get out of sync.
Move all cargo build environment variables into CommandBase

Fixes #11112. r? @metajack

(Not included: CI test to make sure #11112 doesn't regress again.)

This change is

highfive · 2016-05-10T23:37:38Z

Heads up! This PR modifies the following files:

@wafflespeanut: python/servo/command_base.py, python/servo/build_commands.py
@KiChjang: components/script/Cargo.toml

highfive · 2016-05-10T23:37:39Z

Warning

These commits modify script code, but no tests are modified. Please consider adding a test!

metajack · 2016-05-11T00:02:50Z

@bors-servo r+

The CommandBase stuff is a really nice cleanup.

Previously, highfive wrote…

Warning

These commits modify script code, but no tests are modified. Please consider adding a test!

Reviewed 2 of 2 files at r1, 11 of 11 files at r2.
Review status: all files reviewed at latest revision, all discussions resolved.

Comments from Reviewable

bors-servo · 2016-05-11T00:02:51Z

📌 Commit 2d24f48 has been approved by metajack

mbrubeck · 2016-05-11T02:08:19Z

@bors-servo p=1

bors-servo · 2016-05-11T02:49:49Z

⌛ Testing commit 2d24f48 with merge e6efe7c...

@metajack

Use the same build environment and features for CEF, Servo, Gonk, Geckolib * Remove unnecessary dependencies and features from top-level Cargo.tomls. The features for each crate will be computed based on the union of features specified in the dependency graph. Specifying the same ones again just adds more ways for them to get out of sync. * Move all cargo build environment variables into CommandBase Fixes #11112. r? @metajack (Not included: CI test to make sure #11112 doesn't regress again.)  --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11122)

bors-servo · 2016-05-11T02:51:03Z

💔 Test failed - arm32

highfive · 2016-05-11T03:17:05Z

New code was committed to pull request.

mbrubeck · 2016-05-11T03:19:20Z

@bors-servo r=metajack

Fixed a Python error that broke the arm32 build

bors-servo · 2016-05-11T03:19:21Z

📌 Commit 0573d12 has been approved by metajack

bors-servo · 2016-05-11T04:43:24Z

⌛ Testing commit 0573d12 with merge 17b2909...

@metajack

Use the same build environment and features for CEF, Servo, Gonk, Geckolib * Remove unnecessary dependencies and features from top-level Cargo.tomls. The features for each crate will be computed based on the union of features specified in the dependency graph. Specifying the same ones again just adds more ways for them to get out of sync. * Move all cargo build environment variables into CommandBase Fixes #11112. r? @metajack (Not included: CI test to make sure #11112 doesn't regress again.)  --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11122)

bors-servo · 2016-05-11T05:20:50Z

💔 Test failed - android

jdm · 2016-05-11T12:48:11Z

main.rs:22:1: 22:27 error: can't find crate for `android_glue` [E0463]
main.rs:22 extern crate android_glue;
           ^~~~~~~~~~~~~~~~~~~~~~~~~~

The features for each crate will be computed based on the union of features specified in the dependency graph. Specifying the same ones again just adds more ways for them to get out of sync.

highfive · 2016-05-11T15:48:56Z

New code was committed to pull request.

mbrubeck · 2016-05-11T15:54:47Z

@bors-servo r=larsbergstrom p=0

Fix the android build

bors-servo · 2016-05-11T15:54:48Z

📌 Commit b2e874e has been approved by larsbergstrom

mbrubeck · 2016-05-11T16:15:43Z

I notice with this change, build-cef on buildbot is no longer rebuilding the whole dependency graph, but it is still rebuilding the style crate and everything that depends on it:

http://build.servo.org/builders/mac-rel-wpt/builds/947/steps/compile_1/logs/stdio

I suspect this is because some file timestamp is causing Cargo to re-run style's build script (maybe a .pyc file). If so, we could fix this by having the build script print an appropriate cargo:rerun-if-changed line.

metajack · 2016-05-11T16:37:26Z

Doesn't cargo look at .gitignore? Perhaps we're just missing a gitignore rule?

mbrubeck · 2016-05-11T17:16:03Z

Doesn't cargo look at .gitignore? Perhaps we're just missing a gitignore rule?

Cargo doesn’t use git to walk crates within the servo repo, because it doesn’t find the .git directory, because it’s not at the same level as any Cargo.toml file. When Cargo workspaces (RFC 1525) are implemented and we start using them I think that will fix this, and things like this will Just Work™.

mbrubeck · 2016-05-11T19:31:18Z

@bors-servo p=1

bors-servo · 2016-05-11T19:35:34Z

⌛ Testing commit b2e874e with merge 7f76e3b...

@metajack

Use the same build environment and features for CEF, Servo, Gonk, Geckolib * Remove unnecessary dependencies and features from top-level Cargo.tomls. The features for each crate will be computed based on the union of features specified in the dependency graph. Specifying the same ones again just adds more ways for them to get out of sync. * Move all cargo build environment variables into CommandBase Fixes #11112. r? @metajack (Not included: CI test to make sure #11112 doesn't regress again.)  --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11122)

bors-servo · 2016-05-11T20:22:37Z

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows

highfive assigned metajack May 10, 2016

highfive added the S-awaiting-review There is new code that needs to be reviewed. label May 10, 2016

highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels May 11, 2016

highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels May 11, 2016

Move all cargo build environment variables into CommandBase

cce5654

mbrubeck force-pushed the unify-builds branch from 2d24f48 to 0573d12 Compare May 11, 2016 03:17

highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-tests-failed The changes caused existing tests to fail. labels May 11, 2016

highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels May 11, 2016

highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels May 11, 2016

Remove unnecessary dependencies and features from top-level Cargo.tomls

b2e874e

The features for each crate will be computed based on the union of features specified in the dependency graph. Specifying the same ones again just adds more ways for them to get out of sync.

mbrubeck force-pushed the unify-builds branch from 0573d12 to b2e874e Compare May 11, 2016 15:48

highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-tests-failed The changes caused existing tests to fail. labels May 11, 2016

highfive assigned larsbergstrom and unassigned metajack May 11, 2016

highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels May 11, 2016

mbrubeck mentioned this pull request May 11, 2016

Explicitly list inputs to the style crate's build script #11134

Merged

bors-servo merged commit b2e874e into servo:master May 11, 2016

highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label May 11, 2016

This was referenced May 11, 2016

Use Gecko atoms in geckolib. #11095

Closed

(Do not merge) Test orbit. #11110

Closed

Hoist gecko bindings into their own crate #11121

Merged

mbrubeck deleted the unify-builds branch May 17, 2016 22:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use the same build environment and features for CEF, Servo, Gonk, Geckolib #11122

Use the same build environment and features for CEF, Servo, Gonk, Geckolib #11122

mbrubeck commented May 10, 2016 •

edited by larsbergstrom

Loading

highfive commented May 10, 2016

highfive commented May 10, 2016

metajack commented May 11, 2016

bors-servo commented May 11, 2016

mbrubeck commented May 11, 2016

bors-servo commented May 11, 2016

bors-servo commented May 11, 2016

highfive commented May 11, 2016

mbrubeck commented May 11, 2016

bors-servo commented May 11, 2016

bors-servo commented May 11, 2016

bors-servo commented May 11, 2016

jdm commented May 11, 2016

highfive commented May 11, 2016

mbrubeck commented May 11, 2016

bors-servo commented May 11, 2016

mbrubeck commented May 11, 2016

metajack commented May 11, 2016

mbrubeck commented May 11, 2016 •

edited

Loading

mbrubeck commented May 11, 2016

bors-servo commented May 11, 2016

bors-servo commented May 11, 2016

Use the same build environment and features for CEF, Servo, Gonk, Geckolib #11122

Use the same build environment and features for CEF, Servo, Gonk, Geckolib #11122

Conversation

mbrubeck commented May 10, 2016 • edited by larsbergstrom Loading

highfive commented May 10, 2016

highfive commented May 10, 2016

metajack commented May 11, 2016

bors-servo commented May 11, 2016

mbrubeck commented May 11, 2016

bors-servo commented May 11, 2016

bors-servo commented May 11, 2016

highfive commented May 11, 2016

mbrubeck commented May 11, 2016

bors-servo commented May 11, 2016

bors-servo commented May 11, 2016

bors-servo commented May 11, 2016

jdm commented May 11, 2016

highfive commented May 11, 2016

mbrubeck commented May 11, 2016

bors-servo commented May 11, 2016

mbrubeck commented May 11, 2016

metajack commented May 11, 2016

mbrubeck commented May 11, 2016 • edited Loading

mbrubeck commented May 11, 2016

bors-servo commented May 11, 2016

bors-servo commented May 11, 2016

mbrubeck commented May 10, 2016 •

edited by larsbergstrom

Loading

mbrubeck commented May 11, 2016 •

edited

Loading