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

Windows: Add icon to servo.exe #20316

Merged
merged 1 commit into from Mar 18, 2018
Merged

Windows: Add icon to servo.exe #20316

merged 1 commit into from Mar 18, 2018

Conversation

@UK992
Copy link
Contributor

UK992 commented Mar 16, 2018

Based on #11969


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors

This change is Reviewable

@highfive
Copy link

highfive commented Mar 16, 2018

Heads up! This PR modifies the following files:

  • @wafflespeanut: python/servo/package_commands.py, python/servo/build_commands.py
  • @paulrouget: components/servo/servo.exe.manifest, ports/servo/build.rs, ports/servo/platform/windows/servo.exe.manifest, ports/servo/Cargo.toml
@jdm
Copy link
Member

jdm commented Mar 16, 2018

Looks like some more cfg magic will be necessary:

error[E0433]: failed to resolve. Use of undeclared type or module `winres`
  --> ports/servo/build.rs:21:23
   |
21 |         let mut res = winres::WindowsResource::new();
   |                       ^^^^^^ Use of undeclared type or module `winres`
error: aborting due to previous error
error: Could not compile `servo`.
@UK992 UK992 force-pushed the UK992:win32-icon branch from 115f890 to 13ce5c2 Mar 17, 2018
@jdm
Copy link
Member

jdm commented Mar 18, 2018

@bors-servo r+
Thanks for looking into this!

@bors-servo
Copy link
Contributor

bors-servo commented Mar 18, 2018

📌 Commit 13ce5c2 has been approved by jdm

@highfive highfive assigned jdm and unassigned Manishearth Mar 18, 2018
@bors-servo
Copy link
Contributor

bors-servo commented Mar 18, 2018

Testing commit 13ce5c2 with merge 840c44e...

bors-servo added a commit that referenced this pull request Mar 18, 2018
Windows: Add icon to servo.exe

Based on #11969

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors

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

bors-servo commented Mar 18, 2018

@bors-servo bors-servo merged commit 13ce5c2 into servo:master Mar 18, 2018
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@UK992 UK992 deleted the UK992:win32-icon branch Mar 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.