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.

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

UWP: non random port for devtools, and support for custom UWP prefs #27304

Merged
merged 4 commits into from Jul 21, 2020

Conversation

paulrouget
Copy link
Contributor

@paulrouget paulrouget commented Jul 17, 2020

packages-prefs.json is now taken into account for libsimpleservo. Making it possible to have custom pref for the UWP builds, removing some weirdness in the way we handle preferences in the hololens code.

This also adds a new set of preferences to control the devtools server startup state, and make the port choice constant across sessions.

Fix #27267
Fix #22970

jdm
jdm approved these changes Jul 17, 2020
Copy link
Member

@jdm jdm left a comment

This is a nice cleanup!

@paulrouget
Copy link
Contributor Author

paulrouget commented Jul 20, 2020

What about the args variable that is passed in?

Good catch. Fixed.

@paulrouget
Copy link
Contributor Author

paulrouget commented Jul 20, 2020

Hold on. I found a regression.

@paulrouget
Copy link
Contributor Author

paulrouget commented Jul 20, 2020

The way the homepage pref was overridden wouldn't work because we were relying on the fact that the UWP pref always had a shell.homepage key, which is not the case anymore as we use the servo pref.

Fixed with: 9174b20#diff-831a752eac48b390b35aae339dbc1097R375

@jdm
Copy link
Member

jdm commented Jul 20, 2020

@bors-servo r+

@bors-servo
Copy link
Contributor

bors-servo commented Jul 20, 2020

📌 Commit b56dccb has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Jul 20, 2020

Testing commit b56dccb with merge 8cf45f4...

bors-servo added a commit that referenced this issue Jul 20, 2020
UWP: non random port for devtools, and support for custom UWP prefs

packages-prefs.json is now taken into account for libsimpleservo. Making it possible to have custom pref for the UWP builds, removing some weirdness in the way we handle preferences in the hololens code.

This also adds a new set of preferences to control the devtools server startup state, and make the port choice constant across sessions.

Fix #27267
Fix #22970
@bors-servo
Copy link
Contributor

bors-servo commented Jul 20, 2020

💔 Test failed - status-taskcluster

@jdm
Copy link
Member

jdm commented Jul 20, 2020

error: unused import: `set_pref`
  --> ports\libsimpleservo\api\src\lib.rs:34:33
   |
34 | use servo::servo_config::{pref, set_pref};
   |                                 ^^^^^^^^
   |
   = note: `-D unused-imports` implied by `-D warnings`

@paulrouget
Copy link
Contributor Author

paulrouget commented Jul 21, 2020

@bors-servo r=jdm

@bors-servo
Copy link
Contributor

bors-servo commented Jul 21, 2020

📌 Commit 1b0de56 has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Jul 21, 2020

Testing commit 1b0de56 with merge 774673d...

@bors-servo
Copy link
Contributor

bors-servo commented Jul 21, 2020

☀️ Test successful - status-taskcluster
Approved by: jdm
Pushing 774673d to master...

@bors-servo bors-servo merged commit 774673d into servo:master Jul 21, 2020
2 checks passed
bors-servo added a commit that referenced this issue Jul 23, 2020
bors-servo added a commit that referenced this issue Jul 23, 2020
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.

5 participants