mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Auto merge of #14829 - Wafflespeanut:browserhtml, r=UK992
Fix browserhtml path <!-- Please describe your changes on the following line: --> I'd missed something in #14817, which now prevents us from running `./mach run -r -b`. @UK992 pointed this in the PR, but it got merged soon 😐 --- <!-- 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 <!-- Either: --> - [x] These changes do not require tests because it's a fix for mach <!-- 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="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14829) <!-- Reviewable:end -->
This commit is contained in:
commit
128aac921f
1 changed files with 2 additions and 2 deletions
|
@ -98,7 +98,7 @@ class PostBuildCommands(CommandBase):
|
|||
args = [self.get_binary_path(release, dev)]
|
||||
|
||||
if browserhtml:
|
||||
browserhtml_path = get_browserhtml_path('browserhtml', args[0])
|
||||
browserhtml_path = get_browserhtml_path(args[0])
|
||||
if is_macosx():
|
||||
# Enable borderless on OSX
|
||||
args = args + ['-b']
|
||||
|
@ -109,7 +109,7 @@ class PostBuildCommands(CommandBase):
|
|||
args = args + ['--pref', 'dom.mozbrowser.enabled',
|
||||
'--pref', 'dom.forcetouch.enabled',
|
||||
'--pref', 'shell.builtin-key-shortcuts.enabled=false',
|
||||
path.join(browserhtml_path, 'out', 'index.html')]
|
||||
path.join(browserhtml_path, 'index.html')]
|
||||
|
||||
if headless:
|
||||
set_osmesa_env(args[0], env)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue