Skip to content

Move the servo binary to ports.#14172

Merged
bors-servo merged 1 commit intomasterfrom
ports
Nov 16, 2016
Merged

Move the servo binary to ports.#14172
bors-servo merged 1 commit intomasterfrom
ports

Conversation

@Ms2ger
Copy link
Copy Markdown
Contributor

@Ms2ger Ms2ger commented Nov 11, 2016

This change is Reviewable

@highfive
Copy link
Copy Markdown

Heads up! This PR modifies the following files:

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

@highfive
Copy link
Copy Markdown

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
Copy Markdown
Contributor Author

Ms2ger commented Nov 11, 2016

CC @paulrouget

[dependencies]
backtrace = "0.2"
browserhtml = {git = "https://github.com/browserhtml/browserhtml", branch = "crate"}
glutin_app = {path = "../../ports/glutin"}
Copy link
Copy Markdown
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
Copy Markdown
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
Copy Markdown
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
Copy Markdown
Member

jdm commented Nov 11, 2016

@bors-servo: try

@bors-servo
Copy link
Copy Markdown
Contributor

⌛ Trying commit e0b1ffb with merge 6b332db...

bors-servo pushed a commit that referenced this pull request Nov 11, 2016
@bors-servo
Copy link
Copy Markdown
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
Copy Markdown
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
Copy Markdown
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
Copy Markdown
Contributor Author

Ms2ger commented Nov 13, 2016

@bors-servo try

@bors-servo
Copy link
Copy Markdown
Contributor

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

bors-servo pushed a commit that referenced this pull request Nov 13, 2016
@bors-servo
Copy link
Copy Markdown
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
Copy Markdown
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
Copy Markdown
Contributor Author

Ms2ger commented Nov 14, 2016

@bors-servo try

@bors-servo
Copy link
Copy Markdown
Contributor

⌛ Trying commit f19b36d with merge 0b4b3b9...

bors-servo pushed a commit that referenced this pull request Nov 14, 2016
@Ms2ger
Copy link
Copy Markdown
Contributor Author

Ms2ger commented Nov 14, 2016

@bors-servo try

@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
Copy Markdown
Contributor

💔 Test failed - linux-rel-css

@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
Copy Markdown

  ▶ 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

@bors-servo
Copy link
Copy Markdown
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
Copy Markdown
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
Copy Markdown
Member

@bors-servo
Copy link
Copy Markdown
Contributor

⌛ Testing commit 9a5abab with merge f14e733...

bors-servo pushed a commit that referenced this pull request Nov 16, 2016
@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
Copy Markdown
Contributor

@Manishearth
Copy link
Copy Markdown
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
Fixes `./mach doc` regression caused by servo#14172.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants