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

Jump to bottom

Move the servo binary to ports. #14172

Merged
merged 1 commit into from
Nov 16, 2016
Merged

Move the servo binary to ports. #14172

merged 1 commit into from
Nov 16, 2016

Conversation

Ms2ger
Copy link
Contributor

@Ms2ger Ms2ger commented Nov 11, 2016 •
edited by larsbergstrom
Loading

This change is Reviewable

@highfive
Copy link

Heads up! This PR modifies the following files:

  • @wafflespeanut: python/servo/command_base.py, python/servo/build_commands.py

@highfive
Copy link

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Nov 11, 2016
@Ms2ger
Copy link
Contributor Author

Ms2ger commented Nov 11, 2016

CC @paulrouget

SimonSapin
SimonSapin reviewed Nov 11, 2016
View reviewed changes
ports/servo/Cargo.toml
[dependencies]
backtrace = "0.2"
browserhtml = {git = "https://github.com/browserhtml/browserhtml", branch = "crate"}
glutin_app = {path = "../../ports/glutin"}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can / should this new servo crate be merged with the glutin_app crate?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cef uses glutin_app as well

@jdm
Copy link
Member

jdm commented Nov 11, 2016

./ports/servo/Cargo.toml:0: .toml file should contain a valid license.

@jdm jdm added the S-fails-tidy `./mach test-tidy` reported errors. label Nov 11, 2016
@jdm
Copy link
Member

jdm commented Nov 11, 2016

@bors-servo: try

@bors-servo
Copy link
Contributor

⌛ Trying commit e0b1ffb with merge 6b332db...

bors-servo pushed a commit that referenced this pull request Nov 11, 2016
Auto merge of #14172 - servo:ports, r=<try>
6b332db 
Move the servo binary to ports.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14172)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

💔 Test failed - linux-dev

@highfive highfive added the S-tests-failed The changes caused existing tests to fail. label Nov 11, 2016
@jdm
Copy link
Member

jdm commented Nov 11, 2016 

error: no matching package named `servo` found (required by `embedding`)
location searched: file:///home/servo/buildbot/slave/linux-dev/build/components/servo
version required: *

build-cef failed.

@bors-servo
Copy link
Contributor

☔ The latest upstream changes (presumably #14177) made this pull request unmergeable. Please resolve the merge conflicts.

@highfive highfive added S-needs-rebase There are merge conflict errors. and removed S-tests-failed The changes caused existing tests to fail. labels Nov 12, 2016
@Ms2ger
Copy link
Contributor Author

Ms2ger commented Nov 13, 2016

@bors-servo try

@bors-servo
Copy link
Contributor

⌛ Trying commit 8fc4d9f with merge 40b3a8b...

bors-servo pushed a commit that referenced this pull request Nov 13, 2016
Auto merge of #14172 - servo:ports, r=<try>
40b3a8b 
Move the servo binary to ports.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14172)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

💔 Test failed - mac-rel-wpt1

@highfive highfive added the S-tests-failed The changes caused existing tests to fail. label Nov 13, 2016
@jdm
Copy link
Member

jdm commented Nov 13, 2016 

   Compiling servo v0.0.1 (file:///Users/servo/buildbot/slave/mac-rel-wpt1/build/ports/servo)
error: file not found for module `macos`
  --> main.rs:52:13
   |
52 |     pub mod macos;
   |             ^^^^^
   |
   = help: name the file either macos.rs or macos/mod.rs inside the directory "platform"

@highfive highfive removed the S-tests-failed The changes caused existing tests to fail. label Nov 14, 2016
@Ms2ger
Copy link
Contributor Author

Ms2ger commented Nov 14, 2016

@bors-servo try

@bors-servo
Copy link
Contributor

⌛ Trying commit f19b36d with merge 0b4b3b9...

bors-servo pushed a commit that referenced this pull request Nov 14, 2016
Auto merge of #14172 - servo:ports, r=<try>
0b4b3b9 
Move the servo binary to ports.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14172)
<!-- Reviewable:end -->
@Ms2ger
Copy link
Contributor Author

Ms2ger commented Nov 14, 2016

@bors-servo try

@highfive 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 Nov 16, 2016
@highfive
Copy link 

  ▶ TIMEOUT [expected PASS] /css21_dev/html4/margin-bottom-044.htm
  │ 
  │ VMware, Inc.
  │ Gallium 0.4 on softpipe
  └ 3.3 (Core Profile) Mesa 12.0.1

  ▶ TIMEOUT [expected PASS] /css21_dev/html4/margin-bottom-056.htm
  │ 
  │ VMware, Inc.
  │ Gallium 0.4 on softpipe
  │ 3.3 (Core Profile) Mesa 12.0.1
  └ Shutting down the Constellation after generating an output file or exit flag specified

@Manishearth
Copy link
Member

@bors-servo retry

@bors-servo
Copy link
Contributor

⚡ Previous build results for arm32, arm64, linux-dev, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-dev are reusable. Rebuilding only linux-rel-css, linux-rel-wpt...

@bors-servo
Copy link
Contributor

💔 Test failed - linux-rel-css

@highfive highfive added the S-tests-failed The changes caused existing tests to fail. label Nov 16, 2016
@Manishearth
Copy link
Member

@bors-servo retry

@bors-servo
Copy link
Contributor

⌛ Testing commit 9a5abab with merge f14e733...

bors-servo pushed a commit that referenced this pull request Nov 16, 2016
Auto merge of #14172 - servo:ports, r=jdm
f14e733 
Move the servo binary to ports.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14172)
<!-- Reviewable:end -->
@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-tests-failed The changes caused existing tests to fail. labels Nov 16, 2016
@bors-servo
Copy link
Contributor

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

@bors-servo bors-servo merged commit 9a5abab into master Nov 16, 2016
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Nov 16, 2016
This was referenced Nov 16, 2016
Merged
Merged
Merged
Merged
Merged
Closed
Merged
@Manishearth
Copy link
Member

This broke the doc build. The docs are likely living in the wrong folder now.

@Manishearth Manishearth deleted the ports branch November 17, 2016 00:49
mbrubeck added a commit to mbrubeck/servo that referenced this pull request Nov 17, 2016
@mbrubeck
Run cargo doc on libservo crate
39a221a 
Fixes `./mach doc` regression caused by servo#14172.
@mbrubeck mbrubeck mentioned this pull request Nov 17, 2016
Merged
bors-servo pushed a commit that referenced this pull request Nov 17, 2016
Auto merge of #14254 - mbrubeck:mach-doc-fix, r=metajack
efae67e 
Run cargo doc on libservo crate

Fixes `./mach doc` regression caused by #14172.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14254)
<!-- Reviewable:end -->
kvark added a commit that referenced this pull request Nov 17, 2016
@kvark
Updated cargo paths for the python script
f43c285 
Related to #14172

Needed this for `./mach cargo-update -p webrender` to work properly when replacing with a local copy
@kvark kvark mentioned this pull request Nov 17, 2016
Merged
5 tasks
bors-servo pushed a commit that referenced this pull request Nov 18, 2016
Auto merge of #14266 - servo:kvark-cargo, r=metajack
cc06363 
Updated cargo paths for the python script

<!-- Please describe your changes on the following line: -->
Related to #14172

Needed this for `./mach cargo-update -p webrender` to work properly when replacing with a local copy

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because it's not adding any new logic

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14266)
<!-- Reviewable:end -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SimonSapin SimonSapin SimonSapin left review comments

Assignees

@jdm jdm

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Ms2ger @highfive @jdm @bors-servo @Manishearth @SimonSapin