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

Fix ./mach --browserhtml #11543

Merged
merged 1 commit into from Jun 9, 2016
Merged

Fix ./mach --browserhtml #11543

merged 1 commit into from Jun 9, 2016

Conversation

@UK992
Copy link
Contributor

UK992 commented Jun 1, 2016 •
edited by larsbergstrom

Rebased #10943 and simplified by #10943 (comment).
Fixes path related issue with browser.html on Windows and enable borderless window only on OSX.

r? @metajack

This change is Reviewable
@highfive
Copy link

highfive commented Jun 1, 2016

Heads up! This PR modifies the following files:

  • @wafflespeanut: python/servo/command_base.py, python/servo/post_build_commands.py
@metajack
Copy link
Contributor

metajack commented Jun 1, 2016

Why would we only enable borderless on OS X? We'll get two title bars on Linux and Windows without -b won't we?
@metajack
Copy link
Contributor

metajack commented Jun 1, 2016

cc @paulrouget
@UK992
Copy link
Contributor Author

UK992 commented Jun 1, 2016

It doesn't work on Linux at all (#10943 (comment)), on Windows is broken.
@jdm jdm mentioned this pull request Jun 4, 2016
Closed
@bors-servo
Copy link
Contributor

bors-servo commented Jun 6, 2016

☔ The latest upstream changes (presumably #11210) made this pull request unmergeable. Please resolve the merge conflicts.
@adamncasey @UK992
Only enable borderless browserhtml window on OSX.
Loading status checks…
64c5c3e 
Pass browserhtml path as relative path to avoid a mingw->windows path conversion
@UK992 UK992 force-pushed the UK992:browserhtml branch from 2b11b9e to 64c5c3e Jun 7, 2016
@jdm
Copy link
Member

jdm commented Jun 8, 2016

Ping @metajack!
@jdm jdm removed the S-needs-rebase label Jun 8, 2016
@metajack
Copy link
Contributor

metajack commented Jun 8, 2016

So I just tested this and -b works fine on Windows. However, browser.html is broken with -b on Windows.

./mach run -r -- -b tests/html/about-mozilla.html does what I expect.
@metajack
Copy link
Contributor

metajack commented Jun 8, 2016

@UK992 So I can't get browser.html to work at all from master on windows. I've tried with -b -w without either, and with each alone. All result in a white screen and a bunch of messages like ERROR:js::rust: Error at http://localhost:6060/components/main.js:9142:15: thunk did not return a valid node

cc @paulrouget @tschneidereit
@UK992
Copy link
Contributor Author

UK992 commented Jun 8, 2016 •
edited

@metajack convert to relative path make browser.html work on windows, excluding -b make browser.html a bit more useful on windows, since borderless window is fixed, can't move or resize.
@metajack
Copy link
Contributor

metajack commented Jun 9, 2016

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Jun 9, 2016

📌 Commit 64c5c3e has been approved by metajack
@bors-servo
Copy link
Contributor

bors-servo commented Jun 9, 2016

⌛ Testing commit 64c5c3e with merge 28c0b86...
bors-servo added a commit that referenced this pull request Jun 9, 2016
@bors-servo
Auto merge of #11543 - UK992:browserhtml, r=metajack
Loading status checks…
28c0b86 
Fix ./mach --browserhtml

Rebased #10943 and simplified by #10943 (comment).
Fixes path related issue with browser.html on Windows and enable borderless window only on OSX.

r? @metajack

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

bors-servo commented Jun 9, 2016

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows
@bors-servo bors-servo merged commit 64c5c3e into servo:master Jun 9, 2016
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@UK992 UK992 deleted the UK992:browserhtml branch Jun 30, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@metajack metajack

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@UK992 @highfive @metajack @bors-servo @jdm @adamncasey
You can’t perform that action at this time.