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 Windows packaging to create an MSI installer #11967

Merged
merged 1 commit into from Jul 25, 2016
Merged

Add Windows packaging to create an MSI installer #11967

merged 1 commit into from Jul 25, 2016

Conversation

@metajack
Copy link
Contributor

metajack commented Jun 30, 2016 •
edited by jdm

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #__ (github issue number if applicable).
  • There are tests for these changes OR
  • These changes do not require tests because they require manual testing

This change is Reviewable
@highfive
Copy link

highfive commented Jun 30, 2016

Heads up! This PR modifies the following files:
@metajack
Copy link
Contributor Author

metajack commented Jun 30, 2016

This isn't quite ready to merge yet. Trying to figure out why bhtml isn't loading.
@Coder206
Copy link
Contributor

Coder206 commented Jun 30, 2016

@metajack Should we add the ico for Windows Servo icon? (#11315)
@metajack
Copy link
Contributor Author

metajack commented Jun 30, 2016

@Coder206 it's already there in resources
@Coder206
Copy link
Contributor

Coder206 commented Jun 30, 2016

@metajack Wait, what? So why is there a need for #11315?
@Coder206
Copy link
Contributor

Coder206 commented Jun 30, 2016

@metajack I don't see an .ico file for Windows... I just see servo.png
@larsbergstrom
Copy link
Contributor

larsbergstrom commented Jun 30, 2016

At first blush, it looks good to me.

@Coder206 https://github.com/metajack/servo/blob/3fcf7316728cbbe117fe466107540f08b3b119cf/resources/Servo.ico is in the commit...
@larsbergstrom
Copy link
Contributor

larsbergstrom commented Jun 30, 2016

Oh, one more change needs to be made:
https://github.com/servo/servo/blob/master/etc/ci/upload_nightly.sh#L34-L35

Has to be changed to upload the .msi instead of the .tar.gz.
@metajack metajack force-pushed the metajack:windows-package branch from 3fcf731 to 38dcdd8 Jun 30, 2016
@larsbergstrom larsbergstrom mentioned this pull request Jul 1, 2016
Closed
11 of 11 tasks complete
@bors-servo
Copy link
Contributor

bors-servo commented Jul 1, 2016

☔ The latest upstream changes (presumably #12004) made this pull request unmergeable. Please resolve the merge conflicts.
@waddlesplash waddlesplash mentioned this pull request Jul 2, 2016
Closed
0 of 5 tasks complete
support/windows/Servo.wxs.mako
@@ -0,0 +1,192 @@
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Name="Servo Tech Demo"

This comment has been minimized.

Sign in to view
@aneeshusa

aneeshusa Jul 2, 2016

Member

Change this to "Servo Nightly" perhaps?
@aneeshusa aneeshusa mentioned this pull request Jul 3, 2016
Closed
4 of 5 tasks complete
@Coder206 Coder206 mentioned this pull request Jul 8, 2016
Closed
@larsbergstrom larsbergstrom mentioned this pull request Jul 20, 2016
Closed
@metajack metajack force-pushed the metajack:windows-package branch 2 times, most recently from f0e38f1 to 7063362 Jul 21, 2016
@metajack
Copy link
Contributor Author

metajack commented Jul 22, 2016

This latest version appears to work, but requires a hardcoded path, has screwy font metrics, and is really slow.

cc @larsbergstrom
@larsbergstrom larsbergstrom mentioned this pull request Jul 25, 2016
Closed
0 of 5 tasks complete
@larsbergstrom
Copy link
Contributor

larsbergstrom commented Jul 25, 2016

lgtm

Did you want to push the fonts.conf changes first, or just land this? I don't want to mess up your local working directory while you build :-)
@metajack
Copy link
Contributor Author

metajack commented Jul 25, 2016

I should have a minor update with new fonts.conf stuff in a few mins.
@metajack
Add Windows packaging to create an MSI installer
Loading status checks…
d8c0b87
@metajack metajack force-pushed the metajack:windows-package branch from 7063362 to d8c0b87 Jul 25, 2016
@metajack
Copy link
Contributor Author

metajack commented Jul 25, 2016

@larsbergstrom Ok, this should be working now except that it still isn't using the windows subsystem, so you get the extra console window. I think we can land this as is for people to try and fix the two remaining problems in followups.
@larsbergstrom
Copy link
Contributor

larsbergstrom commented Jul 25, 2016

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

bors-servo commented Jul 25, 2016

📌 Commit d8c0b87 has been approved by larsbergstrom
@highfive highfive assigned larsbergstrom and unassigned pcwalton Jul 25, 2016
@bors-servo
Copy link
Contributor

bors-servo commented Jul 25, 2016

⌛ Testing commit d8c0b87 with merge 2746c47...
bors-servo added a commit that referenced this pull request Jul 25, 2016
@bors-servo
Auto merge of #11967 - metajack:windows-package, r=larsbergstrom
Loading status checks…
2746c47 
Add Windows packaging to create an MSI installer

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because they require manual testing

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

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

bors-servo commented Jul 25, 2016

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows-dev
@bors-servo bors-servo merged commit d8c0b87 into servo:master Jul 25, 2016
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
@bors-servo bors-servo mentioned this pull request Jul 25, 2016
Merged
4 of 5 tasks complete
@metajack metajack deleted the metajack:windows-package branch Jul 27, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@larsbergstrom larsbergstrom

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants
@metajack @highfive @Coder206 @larsbergstrom @bors-servo @aneeshusa @pcwalton
You can’t perform that action at this time.