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

Add UWP port #23658

Closed
wants to merge 7 commits into from
Closed

Add UWP port #23658

wants to merge 7 commits into from
+1,617 −85

Conversation

@jdm
Copy link
Member

jdm commented Jun 28, 2019 •
edited by SimonSapin

This adds two new components to the build - a ./mach build --uwp mode which enables the appropriate settings to generate a usable libsimpleservo DLL, and a new Visual Studio project which makes use of the generated build artifacts. This is still quite experimental, but the goal is to start running these changes through CI to figure out if they break any non-UWP build configurations.

This change is Reviewable
@highfive
Copy link

highfive commented Jun 28, 2019

Heads up! This PR modifies the following files:

  • @wafflespeanut: python/servo/command_base.py, python/servo/build_commands.py
  • @paulrouget: ports/glutin/Cargo.toml, components/servo/Cargo.toml
@highfive
Copy link

highfive commented Jun 28, 2019

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
@jdm
Copy link
Member Author

jdm commented Jun 28, 2019

Depends on servo/surfman#139.
@jdm
Copy link
Member Author

jdm commented Jun 28, 2019

@bors-servo try
@bors-servo
Copy link
Contributor

bors-servo commented Jun 28, 2019

⌛ Trying commit 7a0c87b with merge fceea59...
bors-servo added a commit that referenced this pull request Jun 28, 2019
@bors-servo
Auto merge of #23658 - jdm:hl, r=<try>
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
fceea59 
Add UWP port

This adds two new components to the build - a `./mach build --uwp` mode which enables the appropriate settings to generate a usable libsimpleservo DLL, and a new Visual Studio project which makes use of the generated build artifacts. This is still quite experimental, but the goal is to start running these changes through CI to figure out if they break any non-UWP build configurations.

<!-- 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/23658)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jun 28, 2019

💔 Test failed - status-taskcluster
@jdm
Copy link
Member Author

jdm commented Jun 29, 2019

Verified locally that building with --uwp after fetching the VS project's NuGet package yielded a working UWP app.
@jdm jdm force-pushed the jdm:hl branch from 7a0c87b to 8644441 Jun 29, 2019
@jdm
Copy link
Member Author

jdm commented Jun 29, 2019

@bors-servo try
@bors-servo
Copy link
Contributor

bors-servo commented Jun 29, 2019

⌛ Trying commit 8644441 with merge 02da9f3...
bors-servo added a commit that referenced this pull request Jun 29, 2019
@bors-servo
Auto merge of #23658 - jdm:hl, r=<try>
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
02da9f3 
Add UWP port

This adds two new components to the build - a `./mach build --uwp` mode which enables the appropriate settings to generate a usable libsimpleservo DLL, and a new Visual Studio project which makes use of the generated build artifacts. This is still quite experimental, but the goal is to start running these changes through CI to figure out if they break any non-UWP build configurations.

<!-- 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/23658)
<!-- Reviewable:end -->
@jdm
Copy link
Member Author

jdm commented Jun 29, 2019

r? @paulrouget
@highfive highfive assigned paulrouget and unassigned emilio Jun 29, 2019
@bors-servo
Copy link
Contributor

bors-servo commented Jun 29, 2019

💔 Test failed - status-taskcluster
@jdm jdm added S-fails-tidy and removed S-tests-failed labels Jun 29, 2019
paulrouget and others added 7 commits May 29, 2019
@paulrouget @jdm
implement Visual Studio logs
a46ca86
@paulrouget @jdm
Use StaticStructGenerator on Windows
16dda65
a @jdm
Use fixed webrender.
b5e8ca4
@paulrouget @jdm
Hololens port
df3b4e7
@paulrouget @jdm
Hololens documentation
6979a23
@jdm
Fix EGL linking.
bc89fed
@jdm
Simplify build process for UWP app.
Loading status checks…
5140547
@jdm jdm force-pushed the jdm:hl branch from 8644441 to 5140547 Jul 2, 2019
@jdm
Copy link
Member Author

jdm commented Jul 2, 2019

@paulrouget This is ready to merge once it's reviewed :)
@jdm jdm removed the S-fails-tidy label Jul 2, 2019
@bors-servo
Copy link
Contributor

bors-servo commented Jul 3, 2019

☔ The latest upstream changes (presumably #23675) made this pull request unmergeable. Please resolve the merge conflicts.
@paulrouget
Copy link
Contributor

paulrouget commented Jul 3, 2019

Some of the commits include the author "a" instead of jdm.

Don't we want to upstream the webrender changes first?

I still have a few things I need to figure out before merging this, also, servo's hl branch has changed a bit in the past few days.
@paulrouget
Copy link
Contributor

paulrouget commented Jul 3, 2019

also, servo's hl branch has changed a bit in the past few days.

I've introduced a --hololens mach option, but your --uwp does more.

I'm testing locally, renaming the <a> author, and I think we'll be good to go.
@paulrouget paulrouget mentioned this pull request Jul 3, 2019
Merged
@jdm
Copy link
Member Author

jdm commented Jul 3, 2019

I want to use the webrender fork right now because the PR to upgrade webrender to a more recent revision is blocked on a PR to the upstream WPT infrastructure and all the reviewers for it are on vacation.
@paulrouget
Copy link
Contributor

paulrouget commented Jul 3, 2019

Closing in favor of #23696
@paulrouget paulrouget closed this Jul 3, 2019
bors-servo added a commit that referenced this pull request Jul 4, 2019
@bors-servo
Auto merge of #23696 - servo:hl, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
b32bff3 
Add UWP port - bis

This is #23658 with some fixes:
- removed nspr from DLL dependencies (was breaking VS build)
- exclude symbols from header file (was breaking VS build)
- rebased

Before merging:
- please check the rebased commit that introduces the `--uwp` option (things moved around since 7c85dc0)
- should we wait until the WR fix lands upstream?

<!-- 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/23696)
<!-- Reviewable:end -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@paulrouget paulrouget

Labels
S-awaiting-review S-needs-rebase
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@jdm @highfive @bors-servo @paulrouget @emilio
You can’t perform that action at this time.