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

Create Servo.app and dmg on mac package #11899

Merged
merged 1 commit into from Jun 28, 2016
Merged

Create Servo.app and dmg on mac package #11899

merged 1 commit into from Jun 28, 2016

Conversation

@cbrewster
Copy link
Member

cbrewster commented Jun 28, 2016 •
edited by larsbergstrom

This creates Servo.app and puts it in a dmg along with a symlink to /Applications.

  • ./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 creating packager

This change is Reviewable
python/servo/package_commands.py Outdated
'--pref', 'dom.forcetouch.enabled',
'--pref', 'shell.builtin-key-shortcuts.enabled=false',
'--resources-path', '${0%/*}/../Resources',
path.join('${0%/*}/../Resources', browserhtml_path.split('/')[-1], 'out', 'index.html')]

This comment has been minimized.

Sign in to view
@paulrouget

paulrouget Jun 28, 2016

Contributor

At this point, why not updating prefs.json?

This comment has been minimized.

Sign in to view
@cbrewster

cbrewster Jun 28, 2016

Author Member

Wouldn't this change the prefs for development runs aswell? or should we have a separate prefs.json just for packaging?

This comment has been minimized.

Sign in to view
@paulrouget

paulrouget Jun 28, 2016

Contributor

A separate json file maybe? In that json file, you could force webrender, the -b option, set all the other prefs and also add the location of the html page to load (shell.homepage).

Also, as for the resources path, we probably want to fix resources_dir_path() to return the ../Resources directory.

With all of that, you wouldn't need a special script, but just run ./servo.

I'm not sure what is best (a custom script or have a separate json file), but I think at least we should fix resources_dir_path().

This comment has been minimized.

Sign in to view
@cbrewster

cbrewster Jun 28, 2016

Author Member

I fixed resources_dir_path() just by checking every directory backwards until it finds a resource folder. I just cannot figure out how to get the location of the bhtml index for shell.homepage. I have the index in Servo.app/Contents/Resources/bhtml/out.index.html but I cannot figure out what that path needs to be relative to.

This comment has been minimized.

Sign in to view
@cbrewster

cbrewster Jun 28, 2016

Author Member

We might have to keep the script just to get shell.homepage to work. Other than that, the prefs can be kept in a separate json.
@cbrewster cbrewster force-pushed the cbrewster:app_packaging branch from 15a5773 to 5de50e0 Jun 28, 2016
@larsbergstrom
Copy link
Contributor

larsbergstrom commented Jun 28, 2016 

./python/servo/package_commands.py:107: Line is longer than 120 characters

Otherwise, this lgtm.
@larsbergstrom larsbergstrom self-assigned this Jun 28, 2016
@cbrewster
create an app bundle and package it in dmg
Loading status checks…
96b7a19 
Fix resource lookup, add package prefs

fix tidy issues
@cbrewster cbrewster force-pushed the cbrewster:app_packaging branch from 5de50e0 to 96b7a19 Jun 28, 2016
@cbrewster
Copy link
Member Author

cbrewster commented Jun 28, 2016

@bors-servo r=larsbergstrom
@bors-servo
Copy link
Contributor

bors-servo commented Jun 28, 2016

📌 Commit 96b7a19 has been approved by larsbergstrom
@bors-servo
Copy link
Contributor

bors-servo commented Jun 28, 2016

⌛ Testing commit 96b7a19 with merge 7b2080c...
bors-servo added a commit that referenced this pull request Jun 28, 2016
@bors-servo
Auto merge of #11899 - ConnorGBrewster:app_packaging, r=larsbergstrom
Loading status checks…
7b2080c 
Create Servo.app and dmg on mac package

<!-- Please describe your changes on the following line: -->
This creates Servo.app and puts it in a dmg along with a symlink to `/Applications`.

---
<!-- 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 creating packager

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

cbrewster commented Jun 28, 2016

After testing on some other people's macs it look like install_name_tool is not working. It still looks for the dylibs in the old location :/
@bors-servo
Copy link
Contributor

bors-servo commented Jun 28, 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 96b7a19 into servo:master Jun 28, 2016
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@jrmuizel jrmuizel mentioned this pull request Jan 22, 2018
Closed
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

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